Commit Graph

194 Commits

Author SHA1 Message Date
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -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
a7fa111930 split AIS url into parts for reuse 2021-06-22 09:11:00 -04:00
b238e3c727 added identity service healthcheck 2021-05-06 14:13:12 -04:00
7590f2d390 Merge branch 'aps-base' into aps 2021-04-19 08:26:27 -04:00
2d91d8bc08 renamed proxy from acs to aps 2021-04-19 08:26:13 -04:00
brian
456950f31d Merge branch 'acs-lats' into acs-backend 2021-04-02 09:14:29 -04:00
brian
6740f23779 Merge branch 'acs-search' into acs-backend 2021-04-02 09:14:28 -04:00
brian
880221a953 Merge branch 'acs-lats-base' into acs-lats 2021-04-02 09:14:00 -04:00
brian
398d6692f8 Merge branch 'acs' into acs-lats 2021-04-02 09:13:59 -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
5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -04:00
brian
8b7ec4654e Merge branch 'aps-base' into aps 2021-04-02 09:13:16 -04:00
brian
f23cda3fd1 Merge branch 'proxy' into aims 2021-04-02 09:12:59 -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
b4be2e251c changed admin username ot alfresco defaults 2021-01-14 11:40:42 -05:00
44b6f26f4f updates after some acs-enterprise testing 2021-01-14 11:17:01 -05:00
b124cd027c added default admin.1 user 2021-01-14 09:39:34 -05:00
919d842d61 added identity service 2021-01-13 17:01:06 -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
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
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
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
078b2ae35c Merge branch 'acs-lats.acs' into acs-backend.acs-lats 2021-01-06 16:27:31 -05:00
5ff71f0e3c Merge branch 'acs-search.acs' into acs-backend.acs-search 2021-01-06 16:27:17 -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
30f3420ee5 Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base 2021-01-06 16:24:29 -05:00
677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -05:00
2ec11a1135 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2021-01-06 16:12:46 -05:00
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00