cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/4.4 to ad60142
Date Sat, 06 Sep 2014 09:17:58 GMT
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 <lsimons@schubergphilis.com>
Authored: Fri Sep 5 19:54:36 2014 +0200
Committer: Leo Simons <lsimons@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


Mime
View raw message