349 Commits

Author SHA1 Message Date
d5f75ecff5 Merge branch 'aps-aims' into dbp-aims 2023-11-01 10:47:14 -04:00
4c2bdebdba Merge branch 'ags-aims-enterprise' into dbp-aims 2023-11-01 10:47:07 -04:00
293d5cdf36 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-11-01 10:45:53 -04:00
d7c7ba0c69 Merge branch 'acs-aims' into acs-aims-enterprise 2023-11-01 10:42:32 -04:00
002ecfd466 fix identity integration 2023-11-01 10:41:33 -04:00
bec3617563 Merge branch 'aims' into aps-aims 2023-11-01 10:40:58 -04:00
a6797d5550 Merge branch 'aims' into acs-aims 2023-11-01 10:36:24 -04:00
b211d1ea8a fix well-known reporting 2023-11-01 10:35:56 -04:00
8462b9dbe2 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2023-10-26 14:47:03 -04:00
3581872511 Merge branch 'acs-aims' into acs-aims-enterprise 2023-10-26 14:25:22 -04:00
885e53df2a Merge branch 'acs' into acs-aims 2023-10-26 14:24:38 -04:00
ad307c665a Merge branch 'aps-aims' into dbp-aims 2023-10-26 14:19:01 -04:00
d0593febf2 Merge branch 'aps' into aps-aims 2023-10-26 14:17:44 -04:00
f456bb7ea9 removed mem_limit from proxy 2023-10-26 14:15:11 -04:00
6aa3731165 removed mem_limit from proxy 2023-10-26 14:14:26 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
14dde6464f Merge branch 'dbp' into dbp-aims 2023-10-25 22:46:17 -04:00
7c80c1d4fc Merge branch 'aps' into dbp 2023-10-25 22:42:00 -04:00
1567249c4e Merge branch 'ags-frontend-enterprise' into dbp 2023-10-25 22:40:17 -04:00
f90259eae9 Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2023-10-25 22:38:12 -04:00
854bd252e2 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2023-10-25 22:35:34 -04:00
1732253d8f Merge branch 'acs-aims' into acs-aims-enterprise 2023-10-25 22:30:39 -04:00
350380fb3d Merge branch 'acs-frontend' into acs-aims 2023-10-25 22:29:48 -04:00
9427e0e1cb Merge branch 'aims' into acs-aims 2023-10-25 22:29:17 -04:00
5429c03548 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-25 22:26:52 -04:00
df81075066 Merge branch 'acs-backend' into acs-frontend 2023-10-25 22:09:59 -04:00
890f8ac11a Merge branch 'acs-share-base' into acs-frontend 2023-10-25 22:09:09 -04:00
3202dc9e51 Merge branch 'acs-search' into acs-backend-enterprise 2023-10-25 21:52:34 -04:00
aa6c6e54b6 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2023-10-25 21:51:52 -04:00
a52eb3403f Merge branch 'acs-enterprise' into acs-ats-enterprise 2023-10-25 21:49:34 -04:00
38b5f8dc36 Merge branch 'acs' into acs-enterprise 2023-10-25 21:47:34 -04:00
020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
b009fa9219 Merge branch 'acs-base' into acs-share-base 2023-10-25 20:17:55 -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
d4362a2bcd Merge branch 'aps' into aps-aims 2023-10-25 19:48:28 -04:00
8901d10f82 Merge branch 'aps-base' into aps 2023-10-25 18:39:33 -04:00
fc8a854920 removed elasticsearch 2023-10-25 18:32:39 -04:00
7e526e0e1e Merge branch 'proxy' into aps-base 2023-10-25 18:29:28 -04:00
416fe88c6b Merge branch 'proxy' into aims 2023-10-25 18:27:08 -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
fa3dc8c2a6 Merge branch 'aps-aims' into dbp-aims 2022-11-01 17:57:04 -04:00
e4b335608c Merge branch 'dbp' into dbp-aims 2022-11-01 17:56:39 -04:00
4988944cad Merge branch 'ags-frontend-enterprise' into ags-aims-enterprise 2022-11-01 17:54:06 -04:00
2560dcf1c8 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2022-11-01 17:53:38 -04:00