Skip to content
Permalink
Browse files
Merge branch 'master' into kar
  • Loading branch information
ahgittin committed Mar 30, 2021
2 parents 5b7804d + 7748360 commit e75ce56ed80a25729fab1c1df6ff08c44d0a0832
Showing 1 changed file with 3 additions and 3 deletions.
@@ -20,9 +20,6 @@
if [ -z "${JAVA_MAX_MEM}" ] ; then
export JAVA_MAX_MEM="2G"
fi
if [ -z "${JAVA_MAX_PERM_MEM}" ] ; then
export JAVA_MAX_PERM_MEM="256m"
fi
# use the default DNS TTL, if not specified
if [ -z "${DNS_TTL}" ] ; then
export DNS_TTL="60"
@@ -100,3 +97,6 @@ export EXTRA_JAVA_OPTS="-Dhttps.protocols=TLSv1.1,TLSv1.2 ${EXTRA_JAVA_OPTS}"

# Set the persistence directory
export EXTRA_JAVA_OPTS="-Dbrooklyn.persistence.dir=${BROOKLYN_PERSISTENCE_DIR} ${EXTRA_JAVA_OPTS}"

# Set the memory available to AMP
export EXTRA_JAVA_OPTS="-Xmx${JAVA_MAX_MEM} ${EXTRA_JAVA_OPTS}"

0 comments on commit e75ce56

Please sign in to comment.