450 Commits

Author SHA1 Message Date
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
d3c1579905 Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist 2021-01-13 20:52:46 -05:00
brian
3b83b005c5 Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist 2021-01-13 20:52:45 -05:00
brian
df5d011a3a Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist 2021-01-13 20:52:42 -05:00
brian
c5f2448cf9 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 20:52:40 -05:00
6471292c34 added share proxy to adw 2021-01-13 18:19:06 -05:00
7114bb5de1 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-01-13 18:18:28 -05:00
5ea48c405f added host-based config 2021-01-13 18:14:24 -05:00
brian
b757323701 Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist 2021-01-13 17:38:57 -05:00
brian
812dead437 Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist 2021-01-13 17:38:57 -05:00
brian
e0df60bc8b Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist 2021-01-13 17:38:55 -05:00
brian
8b21dcd843 Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist 2021-01-13 17:38:53 -05:00
brian
806601c800 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:46 -05:00
brian
e9542dbc96 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:45 -05:00
brian
e222fc3fba Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 17:38:42 -05:00
brian
a140d6806f Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 17:38:40 -05: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
brian
cf22527520 Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist 2021-01-13 12:03:27 -05:00
brian
6eeef4cfbe Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist 2021-01-13 12:03:25 -05:00
brian
58a9db5244 Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist 2021-01-13 11:55:45 -05:00
brian
75afb1580b Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:55:43 -05:00
41858ebddb added ADW version and config 2021-01-13 11:47:27 -05:00
69481655e8 Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist 2021-01-13 11:43:15 -05:00
6aa7c2229d Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:38:30 -05:00
fd30fd4555 Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist 2021-01-13 11:37:23 -05:00
5788051f22 Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise 2021-01-13 11:36:13 -05:00
d4616bfdb2 Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist 2021-01-13 11:30:37 -05:00
b534456065 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 11:28:54 -05:00
brian
3409eb4eec Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 11:26:27 -05:00
f977291894 using AGS share-enterprise container 2021-01-13 11:22:01 -05:00
cc4ed62159 Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise 2021-01-13 11:21:00 -05:00
e8a8d088f4 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 11:19:08 -05:00
c9075398cd Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 11:17:17 -05:00
128a289ac3 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:12:52 -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
de8920ba0b Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise 2021-01-13 09:50:51 -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
28e32e34a2 Merge branch 'acs-frontend-persist.acs-backend-persist' into acs-frontend-enterprise-persist.acs-frontend-persist 2021-01-06 16:44:22 -05:00
c7378dd9c2 Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist 2021-01-06 16:43:39 -05:00
6c5f4493dc Merge branch 'acs-backend-persist.acs-backend' into acs-frontend-persist.acs-backend-persist 2021-01-06 16:40:42 -05:00
4f3da7361a Merge branch 'acs-frontend.acs-backend' into acs-frontend-persist.acs-frontend 2021-01-06 16:39:54 -05:00