You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/06 11:17:58 UTC
[1/2] git commit: updated refs/heads/4.4 to ad60142
Repository: cloudstack
Updated Branches:
refs/heads/4.4 6c39c5734 -> ad601425d
bugfix/CLOUDSTACK-7476 for 4.4 branch.
See https://github.com/apache/cloudstack/pull/15 for the pull request
that was merged to master & associated discussion.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6136255
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c6136255
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c6136255
Branch: refs/heads/4.4
Commit: c6136255b95ac81d6da9cebc1b80639242d6a029
Parents: eaf3ad1
Author: Leo Simons <ls...@schubergphilis.com>
Authored: Fri Sep 5 19:54:36 2014 +0200
Committer: Leo Simons <ls...@schubergphilis.com>
Committed: Fri Sep 5 19:54:36 2014 +0200
----------------------------------------------------------------------
packaging/centos63/cloud-usage.rc | 2 +-
packaging/debian/init/cloud-usage | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6136255/packaging/centos63/cloud-usage.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
index 7768d2b..6c113cb 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -80,7 +80,7 @@ start() {
echo -n "Starting $PROGNAME" "$SHORTNAME"
- if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
+ if daemon --pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
-errfile $LOGDIR/cloudstack-usage.err -outfile $LOGDIR/cloudstack-usage.out -Dpid=$$ $CLASS
RETVAL=$?
then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6136255/packaging/debian/init/cloud-usage
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage
index 06b1142..fcede4f 100755
--- a/packaging/debian/init/cloud-usage
+++ b/packaging/debian/init/cloud-usage
@@ -102,7 +102,7 @@ start() {
exit 1
fi
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
+ if start_daemon -p $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH" -pidfile "$PIDFILE" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
RETVAL=$?
then
rc=0
[2/2] git commit: updated refs/heads/4.4 to ad60142
Posted by da...@apache.org.
Merge branch 'hotfix/4.4-7476' of https://github.com/schubergphilis/cloudstack into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad601425
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad601425
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad601425
Branch: refs/heads/4.4
Commit: ad601425d134a30e29769b081e1c11b3684e60f1
Parents: 6c39c57 c613625
Author: Daan Hoogland <da...@onecht.net>
Authored: Sat Sep 6 11:16:47 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sat Sep 6 11:16:47 2014 +0200
----------------------------------------------------------------------
packaging/centos63/cloud-usage.rc | 2 +-
packaging/debian/init/cloud-usage | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------