Merge branch '4.9'

This commit is contained in:
Rohit Yadav 2016-11-09 14:54:20 +05:30
commit 3fa461693c
No known key found for this signature in database
GPG Key ID: 484248210EE3D884

View File

@ -27,7 +27,7 @@ EnvironmentFile=-/etc/default/cloudstack-agent
ExecStart=/bin/sh -ec '\
export ACP=`ls /usr/share/cloudstack-agent/lib/*.jar /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null|tr "\\n" ":"`; \
export CLASSPATH="$ACP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"; \
mkdir -m 0755 -p ${JAVA_TMPDIR} \
mkdir -m 0755 -p ${JAVA_TMPDIR}; \
${JAVA} -Djava.io.tmpdir="${JAVA_TMPDIR}" -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
Restart=always
RestartSec=10s