You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/09 09:26:07 UTC
[1/2] git commit: updated refs/heads/4.9 to cda19b7
Repository: cloudstack
Updated Branches:
refs/heads/4.9 8b786d1fb -> cda19b77f
systemd: Fix semicolon missing in b75e69
While forward merging PR #1728, and resolving merge issues a semi-colon was
not added causing cloudstack-agent to fail to start. This fixes the
issue of running agent on centos7.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cf825eb0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf825eb0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf825eb0
Branch: refs/heads/4.9
Commit: cf825eb044453756a01c01ceb1883d5af4df3f7d
Parents: 8b786d1
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 9 14:44:01 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 9 14:44:01 2016 +0530
----------------------------------------------------------------------
packaging/systemd/cloudstack-agent.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf825eb0/packaging/systemd/cloudstack-agent.service
----------------------------------------------------------------------
diff --git a/packaging/systemd/cloudstack-agent.service b/packaging/systemd/cloudstack-agent.service
index 92ff965..9cde22d 100644
--- a/packaging/systemd/cloudstack-agent.service
+++ b/packaging/systemd/cloudstack-agent.service
@@ -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
[2/2] git commit: updated refs/heads/4.9 to cda19b7
Posted by bh...@apache.org.
Merge pull request #1751 from shapeblue/4.9-centos7agentsystemdfix
systemd: Fix semicolon missing in b75e69While forward merging PR #1728, and resolving merge issues a semi-colon was
not added causing cloudstack-agent to fail to start. This fixes the
issue of running agent on centos7.
Since, this is failing testing against centos7/kvm and an urgent merge is necessary. This affects both 4.9 and master branches.
* pr/1751:
systemd: Fix semicolon missing in b75e69
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cda19b77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cda19b77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cda19b77
Branch: refs/heads/4.9
Commit: cda19b77f789f141dcf42df438f6ef4ce4ddf13d
Parents: 8b786d1 cf825eb
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 9 14:53:29 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 9 14:53:43 2016 +0530
----------------------------------------------------------------------
packaging/systemd/cloudstack-agent.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------