You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/13 12:14:15 UTC
[1/2] git commit: updated refs/heads/master to da66b06
Repository: cloudstack
Updated Branches:
refs/heads/master dbb219364 -> da66b06e7
Fixed the default JAVA_HOME value to be Java8 if not set
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ee4a195
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ee4a195
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ee4a195
Branch: refs/heads/master
Commit: 6ee4a195f27fe59c61e96d0ab1c56dee0c05a52b
Parents: 17787a1
Author: Will Stevens <wi...@gmail.com>
Authored: Fri Feb 10 13:42:58 2017 -0500
Committer: Will Stevens <wi...@gmail.com>
Committed: Fri Feb 10 13:42:58 2017 -0500
----------------------------------------------------------------------
client/tomcatconf/classpath.conf.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ee4a195/client/tomcatconf/classpath.conf.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index e2c5da4..ecdd12a 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -34,8 +34,8 @@ for vendorconf in "@MSCONF@"/vendor/* ; do
CLASSPATH=$vendorconf:$CLASSPATH
done
export CLASSPATH
-if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.7.0 ]; then
- export JAVA_HOME=/usr/lib/jvm/jre-1.7.0
+if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.8.0 ]; then
+ export JAVA_HOME=/usr/lib/jvm/jre-1.8.0
fi
PATH=$JAVA_HOME/bin:/sbin:/usr/sbin:$PATH
export PATH
[2/2] git commit: updated refs/heads/master to da66b06
Posted by ra...@apache.org.
Merge pull request #1938 from swill/classpath
CLOUDSTACK-9780: Fixed the default JAVA_HOME value to be Java8 if not setNow that PR-1888 is merged, Java8 is required. Unfortunately, the file pushed to `/etc/cloudstack/management/classpath.conf` on ACS install will default the version to Java7 instead of Java8 if JAVA_HOME is unset. This fix sets the default to Java8 if JAVA_HOME is not set.
* pr/1938:
Fixed the default JAVA_HOME value to be Java8 if not set
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da66b06e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da66b06e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da66b06e
Branch: refs/heads/master
Commit: da66b06e7d562393da2e4b52206943f8bad49d10
Parents: dbb2193 6ee4a19
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Mon Feb 13 17:44:00 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Mon Feb 13 17:44:00 2017 +0530
----------------------------------------------------------------------
client/tomcatconf/classpath.conf.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------