138 Commits

Author SHA1 Message Date
f66c710a6e Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-07-30 16:13:27 -04:00
daf1d74b66 Merge branch 'acs-search' into acs-backend-enterprise 2021-07-30 16:05:57 -04:00
69b04183bb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-07-30 16:05:42 -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
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
a50c3da468 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-04-02 09:14:39 -04:00
brian
f8638e7a26 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-04-02 09:14:38 -04:00
brian
4d584785ff Merge branch 'ags' into ags-enterprise 2021-04-02 09:14:31 -04:00
brian
96987b7ff1 Merge branch 'acs-enterprise' into ags-enterprise 2021-04-02 09:14:31 -04:00
brian
b6f2befafb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-04-02 09:13:57 -04:00
brian
c11990900c Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-04-02 09:13:56 -04:00
brian
e07cea5ffa Merge branch 'acs-search' into acs-backend-enterprise 2021-04-02 09:13:54 -04:00
brian
6e09a9c0c9 Merge branch 'acs' into ags 2021-04-02 09:13:52 -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
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
f10722dec9 Merge branch 'acs-base' into acs-sync-base 2021-04-02 09:13:22 -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
brian
eaa6f1025d Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 17:38:37 -05:00
3b5fc8c096 fixed sync service config 2021-01-13 17:35:43 -05:00
c9075398cd Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 11:17:17 -05:00
ac7e691100 Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-01-13 11:09:18 -05:00
15ccb5642b using proxy values for sync url 2021-01-13 09:59:21 -05:00
4349851dd9 Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise 2021-01-13 09:56:54 -05:00
4f5a939b71 Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 09:47:53 -05:00
22b2583505 Merge branch 'acs-enterprise' into ags-enterprise 2021-01-13 09:45:50 -05:00
9b3ba22ca1 Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search 2021-01-06 16:33:19 -05:00
0999563353 Merge branch 'acs.acs-base' into ags.acs 2021-01-06 16:27:44 -05: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
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
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
a56556b596 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2021-01-06 15:54:27 -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