trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [2/4] incubator-trafodion git commit: Trafodion-1551 - Change version of Tradion from 1.2.0 to 1.3.0
Date Fri, 23 Oct 2015 18:03:35 GMT
Trafodion-1551 - Change version of Tradion from 1.2.0 to 1.3.0

Missed changing a test, fixed review comments from previous commits.


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

Branch: refs/heads/master
Commit: 6ca31cef396887228ca7c8ea1965f2fe8c01a964
Parents: 288a337
Author: Roberta Marton <roberta.marton@esgyn.com>
Authored: Thu Oct 22 21:32:53 2015 +0000
Committer: Roberta Marton <roberta.marton@esgyn.com>
Committed: Thu Oct 22 21:32:53 2015 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/install_local_hadoop              | 13 ++++++++-----
 .../src/test/java/org/trafodion/jdbc_test/TestCat.java |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ca31cef/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 8e9e053..77db26f 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -1534,11 +1534,14 @@ fi
 
 cd $MY_SW_ROOT
 
-if [ -d $MY_LOCAL_SW_DIST && ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
-  echo "------------------------------------------------------------"
-  echo "-- WARNING: libhdfs.so is not present on this system. Please"
-  echo "--          build it, otherwise Trafodion will not compile."
-  echo "------------------------------------------------------------"
+if [[ -n "$VERBOSE" ]]; then
+
+  if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
+    echo "------------------------------------------------------------"
+    echo "-- WARNING: libhdfs.so is not present on this system. Please"
+    echo "--          build it, otherwise Trafodion will not compile."
+    echo "------------------------------------------------------------"
+  fi
 fi
 
 #For clients

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ca31cef/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
index 934b097..2b7b33c 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
@@ -648,7 +648,7 @@ public class TestCat
         {
             Connection connection = Utils.getUserConnection();
             int i = connection.getMetaData().getDatabaseMinorVersion();
-            assertEquals("DB Minor Version", 2L, i);
+            assertEquals("DB Minor Version", 3L, i);
             connection.close();
             System.out.println("JDBC Get DB minor version : Passed");
         }


Mime
View raw message