Geoff Bourne
ceec69391c
Auto-merging via docker-versions-create
2021-07-17 18:06:45 -05:00
Geoff Bourne
dfa5add6ba
Auto-merging via docker-versions-create
2021-07-14 18:43:35 -05:00
Geoff Bourne
02677ce1e2
Auto-merging via docker-versions-create
2021-07-12 19:11:49 -05:00
Geoff Bourne
2902e13c61
Auto-merging via docker-versions-create
2021-07-09 20:00:33 -05:00
Geoff Bourne
6d01021a30
Auto-merging via docker-versions-create
2021-07-08 18:01:57 -05:00
Geoff Bourne
07ded28d20
Auto-merging via docker-versions-create
2021-07-08 08:06:08 -05:00
itzg
a2d79fb85b
Auto-merging via docker-versions-create
2021-07-08 12:56:12 +00:00
Geoff Bourne
ecf9a090b1
Auto-merging via docker-versions-create
2021-07-08 07:41:13 -05:00
itzg
17a3aa8079
Auto-merging via docker-versions-create
2021-07-04 19:54:11 +00:00
Geoff Bourne
14fb905ec1
Auto-merging from master
2021-07-03 14:29:24 -05:00
Geoff Bourne
8629bf5cb5
ci: auto-merge from master
2021-07-02 16:06:34 -05:00
itzg
f05891e475
Auto-merging via docker-versions-create
2021-07-02 16:56:06 +00:00
itzg
f1453dd4c1
Auto-merging via docker-versions-create
2021-06-28 12:14:17 +00:00
itzg
22b560ba5d
Auto-merging via docker-versions-create
2021-06-27 13:13:22 +00:00
itzg
e3acafee2f
Auto-merging via docker-versions-create
2021-06-24 12:47:16 +00:00
Geoff Bourne
03df627881
Auto-merging via docker-versions-create
2021-06-23 22:36:07 -05:00
Geoff Bourne
d87e5bdaa2
Auto-merging via docker-versions-create
2021-06-20 12:51:26 -05:00
Geoff Bourne
2543a5417c
Auto-merging via docker-versions-create
2021-06-05 17:55:19 -05:00
Geoff Bourne
614f6a4be0
Auto-merging via docker-versions-create
2021-05-24 20:53:08 -05:00
Geoff Bourne
fe9735d8c1
Merge branch 'master' into java16-openj9
2021-05-23 12:27:35 -05:00
Geoff Bourne
10dcbe7b03
Merge from master
2021-05-22 13:47:41 -05:00
Geoff Bourne
85103cd8cf
Auto-merging via docker-versions-create
2021-05-21 23:04:11 -05:00
Geoff Bourne
12915b04b7
Auto-merging via docker-versions-create
2021-05-21 22:53:22 -05:00
Geoff Bourne
fbc8f72a22
ci: adjusted for adoptopenjdk for openj9 only on amd64
2021-05-21 16:49:29 -05:00
Geoff Bourne
7229c40202
Merge branch 'master' into java16-openj9
...
# Conflicts:
# .github/workflows/build-multiarch.yml
# Dockerfile
2021-05-21 16:46:51 -05:00
Geoff Bourne
581b514970
ci: added java16-openj9 branch
...
#885
2021-05-21 16:42:23 -05:00
Geoff Bourne
d030daf354
Auto-merging via docker-versions-create
2021-05-19 20:30:40 -05:00
Geoff Bourne
98e6adbe1a
Auto-merging via docker-versions-create
2021-05-15 12:43:32 -05:00
Geoff Bourne
b94cfc44a0
Merge branch 'multiarch' into java15-openj9
...
# Conflicts:
# .github/workflows/build-multiarch.yml
# Dockerfile
2021-05-14 18:03:39 -05:00
Geoff Bourne
8a9e85fb17
Auto-merging via docker-versions-create
2021-05-06 20:17:17 -05:00
Geoff Bourne
8a39719427
Auto-merging via docker-versions-create
2021-04-30 14:30:25 -05:00
Geoff Bourne
4100aa1f61
Auto-merging via docker-versions-create
2021-04-30 11:14:31 -05:00
Geoff Bourne
4d5fe0a03b
Auto-merging via docker-versions-create
2021-04-28 16:55:09 -05:00
Geoff Bourne
236bb565ce
Auto-merging via docker-versions-create
2021-04-26 08:23:22 -05:00
Geoff Bourne
7608168823
Auto-merging via docker-versions-create
2021-04-24 13:44:55 -05:00
Geoff Bourne
acabb9d93c
Auto-merging via docker-versions-create
2021-04-23 21:05:53 -05:00
Geoff Bourne
4e9c00c4d5
Auto-merging via docker-versions-create
2021-04-18 13:32:45 -05:00
Geoff Bourne
f3826422cf
Auto-merging via docker-versions-create
2021-04-11 10:12:00 -05:00
Geoff Bourne
9b7459ad5c
Merged latest from master
2021-04-08 19:28:35 -05:00
Geoff Bourne
c9dc6012f6
Auto-merging via docker-versions-create
2021-04-01 16:40:16 -05:00
Geoff Bourne
a5aec72837
Added git
...
#819
2021-04-01 16:29:06 -05:00
Geoff Bourne
af38a8fc7a
ci: removed armv7 build since 15-openj9 doesn't include it
2021-03-06 17:27:08 -06:00
Geoff Bourne
58fa3c897d
Merge branch 'master' into java15-openj9
2021-03-06 17:23:02 -06:00
Geoff Bourne
e45621d8e2
ci: Added java15-openj9 branch
2021-03-06 17:22:36 -06:00