289 Commits

Author SHA1 Message Date
7e526e0e1e Merge branch 'proxy' into aps-base 2023-10-25 18:29:28 -04:00
416fe88c6b Merge branch 'proxy' into aims 2023-10-25 18:27:08 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -04:00
6126155ca0 Merge branch 'aims' into aps-aims 2022-11-01 17:49:21 -04:00
b115f86a6d Merge branch 'aps' into aps-aims 2022-11-01 17:48:56 -04:00
9114da403b Merge branch 'aims' into acs-aims 2022-11-01 17:47:43 -04:00
8e6eb7ae72 Merge branch 'acs-frontend' into acs-aims 2022-11-01 17:47:14 -04:00
ff3554c0ce parameterized AIS version 2022-11-01 17:45:46 -04:00
cc77feb9b6 Merge branch 'proxy' into aims 2022-11-01 17:44:59 -04:00
4e85d8118c fixed APS license location 2022-11-01 17:14:49 -04:00
1279c5aeba Merge branch 'aps-base' into aps 2022-11-01 17:09:22 -04:00
dd967a17f2 parameterized APS versions 2022-11-01 17:06:07 -04:00
27a818fd22 Merge branch 'proxy' into aps-base 2022-11-01 17:00:56 -04:00
7fd04f30f3 Merge branch 'acs-share-base' into acs-frontend 2022-11-01 16:23:43 -04:00
226a2d05e2 Merge branch 'acs-backend' into acs-frontend 2022-11-01 16:22:46 -04:00
c60e224a14 Merge branch 'acs-lats' into acs-backend 2022-11-01 16:17:27 -04:00
fc74faf57a Merge branch 'acs-search' into acs-backend 2022-11-01 16:16:59 -04:00
da933f2aa7 Merge branch 'acs' into acs-lats 2022-11-01 16:15:28 -04:00
10aa561c52 Merge branch 'acs-lats-base' into acs-lats 2022-11-01 16:11:15 -04:00
2dc64b23e4 parameterized LATS version 2022-11-01 16:09:56 -04:00
e9186dec84 Merge branch 'acs-base' into acs-lats-base 2022-11-01 16:08:01 -04:00
d556040909 Merge branch 'acs' into acs-search 2022-11-01 16:05:53 -04:00
64f85da579 Merge branch 'acs-search-base' into acs-search 2022-11-01 16:04:44 -04:00
9899d03da9 parameterized ASIE version; enabled secret comms 2022-11-01 15:07:51 -04:00
5b4069427e Merge branch 'acs-base' into acs-search-base 2022-11-01 15:04:21 -04:00
fcd1262721 parameterized ACS share version 2022-11-01 15:03:04 -04:00
d7de714eeb Merge branch 'acs-base' into acs-share-base 2022-11-01 15:01:38 -04:00
7511eba729 added memory limit 2022-11-01 14:54:47 -04:00
173de2375e Merge branch 'acs-base' into acs 2022-11-01 14:52:59 -04:00
8e3301877a parameterized docker image tags 2022-11-01 14:51:11 -04:00
8b4e45c2e2 Merge branch 'proxy' into acs-base 2022-11-01 14:49:06 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
10e7f81163 advancing to docker v3 2022-11-01 14:46:58 -04:00
481e1bb38d Merge branch 'acs-base' into acs 2022-11-01 14:22:57 -04:00
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
cecbf32b68 Merge branch 'aps' into aps-aims 2021-07-30 16:47:25 -04:00
6608b0600c Merge branch 'aims' into aps-aims 2021-07-30 16:46:52 -04:00
52c8e24b3a Merge remote-tracking branch 'origin/acs-frontend' into acs-aims 2021-07-30 16:46:22 -04:00
c8540ca0de Merge branch 'aims' into acs-aims 2021-07-30 16:45:59 -04:00
279eb2af9d updated AIS memory limit mins 2021-07-30 16:44:23 -04:00
0d379094e9 updated AIS to v1.4.0 2021-07-30 16:44:11 -04:00
dee72646e6 updated APS memory limit mins 2021-07-30 16:32:57 -04:00
8c7e433358 Merge branch 'acs-backend' into acs-frontend 2021-07-30 16:15:19 -04:00
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00