Commit Graph

4 Commits

Author SHA1 Message Date
Claudia Agache
250ca1c07f change memory limit for transform-misc and pdf-renderer 2020-11-06 11:24:52 +02:00
Claudia Agache
957513c3f3 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-238_APPS-104_no
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/documents/ClassifyActionTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/guides/GuidesAndPartialClearanceTests.java
#	scripts/dockerLimitMemory.sh
2020-11-06 11:24:45 +02:00
Claudia Agache
2cd36ee8ef Limit memory for new containers 2020-10-14 09:18:51 +03:00
Claudia Agache
f7865ba7fd Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-237_RunERTests_no 2020-10-13 13:23:26 +03:00