You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fr...@apache.org on 2014/05/27 23:02:43 UTC
git commit: updated refs/heads/master to d0c249b
Repository: cloudstack
Updated Branches:
refs/heads/master 57110a7f5 -> d0c249bc9
updating cloud-usage.rc file to start cloudstack-usage server with java 1.7
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0c249bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0c249bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0c249bc
Branch: refs/heads/master
Commit: d0c249bc9eb194b81b75865ecda56e353435eeb8
Parents: 57110a7
Author: rayeesn <ra...@citrix.com>
Authored: Tue Apr 8 07:06:00 2014 -0700
Committer: Frank.Zhang <fr...@citrix.com>
Committed: Tue May 27 14:04:38 2014 -0700
----------------------------------------------------------------------
packaging/centos63/cloud-usage.rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0c249bc/packaging/centos63/cloud-usage.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
index a9b6047..6170379 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -47,7 +47,7 @@ unset OPTIONS
[ -r /etc/sysconfig/default/"$SHORTNAME" ] && source /etc/sysconfig/default/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
+JDK_DIRS="/usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-sun /usr/lib/jvm/jre-1.7.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then