ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-11873. Remove "(deprecated)" text from option [2] JDK in setup.(vbrodetskyi)
Date Fri, 12 Jun 2015 11:11:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6dbe315f9 -> 6cfb8dff3


AMBARI-11873. Remove "(deprecated)" text from option [2] JDK in setup.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6cfb8dff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6cfb8dff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6cfb8dff

Branch: refs/heads/trunk
Commit: 6cfb8dff37a48c8573405c01da6cfd6621ec777e
Parents: 6dbe315
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Fri Jun 12 05:49:06 2015 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Fri Jun 12 05:49:06 2015 +0300

----------------------------------------------------------------------
 ambari-server/conf/unix/ambari.properties                          | 2 +-
 .../java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6cfb8dff/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 613fee1..9795bc7 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -24,7 +24,7 @@ shared.resources.dir = /usr/lib/ambari-server/lib/ambari_commons/resources
 custom.action.definitions = /var/lib/ambari-server/resources/custom_action_definitions
 
 java.releases=jdk1.8,jdk1.7
-jdk1.7.desc=Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7 (deprecated)
+jdk1.7.desc=Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7
 jdk1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-7u67-linux-x64.tar.gz
 jdk1.7.dest-file=jdk-7u67-linux-x64.tar.gz
 jdk1.7.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPolicyJDK7.zip

http://git-wip-us.apache.org/repos/asf/ambari/blob/6cfb8dff/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 8430684..22c7f0d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -251,7 +251,7 @@ public class SchemaUpgradeHelper {
       String[] splittedJavaVersion = System.getProperty("java.version").split("\\.");
       float javaVersion = Float.parseFloat(splittedJavaVersion[0] + "." + splittedJavaVersion[1]);
       if (javaVersion < Configuration.JDK_MIN_VERSION) {
-        LOG.error(String.format("Oracle JDK version is lower then %.1f It can cause problems
during upgrade process. Please," +
+        LOG.error(String.format("Oracle JDK version is lower than %.1f It can cause problems
during upgrade process. Please," +
                 " use 'ambari-server setup' command to upgrade JDK!", Configuration.JDK_MIN_VERSION));
         System.exit(1);
       }


Mime
View raw message