100 Commits

Author SHA1 Message Date
49d2647ab6 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:52:20 -04:00
04b394c31c Merge branch 'ats-base' into acs-ats-base 2022-11-01 16:51:54 -04:00
fbbed5946f fixed ASFS docker image path 2022-11-01 16:51:30 -04:00
3283969431 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:29:43 -04:00
bc91054eeb Merge branch 'acs-enterprise' into acs-ats-enterprise 2022-11-01 16:28:26 -04:00
8fd11ed1d6 Merge branch 'acs' into acs-enterprise 2022-11-01 16:26:33 -04:00
831f1cb4f0 Merge branch 'acs-base' into acs-ats-base 2022-11-01 15:32:08 -04:00
0e5181d12a Merge branch 'ats-base' into acs-ats-base 2022-11-01 15:30:48 -04:00
f569d712e1 parameterize Docker image versions 2022-11-01 15:30:07 -04:00
ffac352049 Merge branch 'base' into ats-base 2022-11-01 15:11:57 -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
0662ca345f added ATS memory limit mins 2021-07-30 16:02:01 -04:00
874f04c305 Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-07-30 15:59:59 -04:00
ad948f3f08 Merge branch 'acs' into acs-enterprise 2021-07-30 15:54:12 -04:00
b8016f4ac7 updated ACS memory limits acs-v6 2021-07-30 15:52:07 -04:00
brian
29f4ca7c54 Merge branch 'acs-ats-base' into acs-ats-enterprise 2021-04-02 09:13:50 -04:00
brian
73fea3d13d Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-04-02 09:13:49 -04:00
brian
910cc2e2cb Merge branch 'acs' into acs-enterprise 2021-04-02 09:13:44 -04:00
brian
d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
39928d09fc Merge branch 'ats-base' into acs-ats-base 2021-04-02 09:11:32 -04:00
9859e68fe8 Merge branch 'acs-base' into acs-ats-base 2021-04-02 09:11:22 -04:00
4dccd7892f Merge branch 'base' into ats-base 2021-04-02 09:09:13 -04:00
6bce626075 Merge branch 'proxy' into acs-base acs-base-v6 2021-04-02 08:42:43 -04:00
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
91ad3afc0a removed external dir 2021-04-02 08:40:18 -04:00
76dc8c7ad9 Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base 2021-01-06 16:22:31 -05:00
b024fd8d7e Merge branch 'ats-base.base' into acs-ats-base.ats-base 2021-01-06 16:21:36 -05:00
8a36f91d06 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2021-01-06 16:15:41 -05:00
d3b41dcc46 Merge branch 'base' into ats-base.base 2021-01-06 15:53:29 -05:00
37de03317b Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise 2021-01-06 15:40:03 -05:00
dc9fb0abfa added license dir 2021-01-06 15:39:29 -05:00
68dc071342 configured ACS for ATS 2021-01-06 15:36:32 -05:00
78ec9c2a94 Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base 2021-01-06 15:25:16 -05:00
cafee75cdc set platform to v6.2.2.3 2021-01-06 15:21:05 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
a3cb815dd1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2021-01-06 12:22:27 -05:00
ebd6c503bd Merge branch 'proxy.base' into acs-base.proxy 2021-01-06 12:21:58 -05:00
ac18d6d637 fixed host/protocol URL rewrites 2021-01-06 12:21:21 -05:00
b47583a716 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-26 14:15:39 -05:00
55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
1d5624496d renamed proxy variables to match changes to proxy branch 2020-12-26 13:55:19 -05:00
3a6b5c4850 Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy 2020-12-26 13:54:44 -05:00
817b062dfd merged platform/share into single proxy 2020-12-26 13:54:31 -05:00