129 Commits

Author SHA1 Message Date
1619c075c0 Merge branch 'acs-search' into acs-search-persist 2023-10-26 14:31:22 -04:00
bae1c47984 Merge branch 'acs' into acs-search 2023-10-26 14:27:39 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
25e26949d0 Merge branch 'acs-search' into acs-search-persist 2023-10-25 20:38:04 -04:00
59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
7ef9d4f186 Merge branch 'acs-persist' into acs-search-persist 2023-10-25 20:32:51 -04:00
2eab63c2a8 Merge branch 'acs-search' into acs-search-persist 2023-10-25 20:32:24 -04:00
8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
81ca2ed038 ACS search 2.0.8.2 2023-10-25 20:21:21 -04:00
51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
f7c664e7f4 Merge branch 'acs-base' into acs-persist 2023-10-25 20:14:48 -04:00
ef221d9c7a Merge branch 'acs-base' into acs 2023-10-25 20:11:38 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -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
4748d0e7b6 Merge branch 'acs-persist' into acs-search-persist 2022-11-01 16:44:50 -04:00
299d2fe04d Merge branch 'acs-search-base' into acs-search-persist 2022-11-01 16:43:23 -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
8a7d6d2016 Merge branch 'acs-base' into acs-persist 2022-11-01 15:09:25 -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
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
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
b8016f4ac7 updated ACS memory limits acs-v6 2021-07-30 15:52:07 -04:00
brian
2c82f844b1 Merge branch 'acs-search-base' into acs-search-persist 2021-04-02 09:13:47 -04:00
brian
b805fbbd1a Merge branch 'acs-persist' into acs-search-persist 2021-04-02 09:13:46 -04:00
brian
99d39fa7f7 Merge branch 'acs-search-base' into acs-search 2021-04-02 09:13:42 -04:00
brian
1778fd04a4 Merge branch 'acs' into acs-search 2021-04-02 09:13:41 -04:00
brian
d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
brian
a72d43a6af Merge branch 'acs-base' into acs-search-base 2021-04-02 09:13:30 -04:00
brian
b7c883068a Merge branch 'acs-base' into acs-persist 2021-04-02 09:13:27 -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
2878298644 Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base 2021-01-06 16:26:04 -05:00
11bb8c62ed Merge branch 'acs.acs-base' into acs-search.acs 2021-01-06 16:24:47 -05:00
6a8b1e2628 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2021-01-06 16:11:47 -05:00
932159b238 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2021-01-06 16:11:28 -05:00
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
135739da10 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2021-01-06 15:56:03 -05:00