319 Commits

Author SHA1 Message Date
4dccd7892f Merge branch 'base' into ats-base 2021-04-02 09:09:13 -04:00
6e0c055222 Merge branch 'proxy' into aps-base 2021-04-02 09:06:48 -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
7d0eadd920 Merge branch 'aps-persist-base' into aps-persist 2021-01-13 16:19:52 -05:00
912249c388 Merge branch 'aps-base' into aps-persist-base 2021-01-13 16:19:26 -05:00
brian
83c123de08 Merge branch 'aps' into aps-persist 2021-01-13 16:16:33 -05:00
brian
9dd046ad51 Merge branch 'aps-base' into aps 2021-01-13 16:16:27 -05:00
20b41bbcb1 corrected misspelling 2021-01-13 15:39:02 -05:00
6edb220093 Merge branch 'aps-persist-base' into aps-persist 2021-01-13 15:38:37 -05:00
8ccf85d170 Merge branch 'aps-base' into aps-persist-base 2021-01-13 15:37:41 -05:00
89348916a5 Merge branch 'aps-base' into aps 2021-01-13 15:37:13 -05:00
a2619fac7b fixed license directory var 2021-01-13 15:37:06 -05:00
70eb1fd7fb Merge branch 'aps-base' into aps-persist-base 2021-01-13 15:35:37 -05:00
d7ed2df85e moved store 2021-01-13 15:35:30 -05:00
3a47c43a88 Merge branch 'aps-base' into aps 2021-01-13 15:32:16 -05:00
16aa444b19 removed excess file mapping 2021-01-13 15:32:03 -05:00
7caee29b23 added persistence volumes 2021-01-13 15:30:34 -05:00
deb6bf058c Merge branch 'aps-base' into aps 2021-01-13 15:23:44 -05:00
8a0ccc61a5 backported some stuff from aps to aps-base 2021-01-13 15:22:30 -05:00
695e3b3dc0 fixed after testing 2021-01-13 15:20:03 -05:00
2b7755222b added versions and config to APS 2021-01-13 14:42:41 -05:00
237a8abd62 fixed proxy depends_on 2021-01-13 14:33:11 -05:00
f28c16c4fe initial aps base 2021-01-13 14:32:12 -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