trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [4/4] incubator-trafodion git commit: Merge remote branch 'origin/pr/141/head' into mrg_71
Date Fri, 23 Oct 2015 18:03:37 GMT
Merge remote branch 'origin/pr/141/head' into mrg_71


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

Branch: refs/heads/master
Commit: 393eae3c1cacc9f4b4ad1ccaa70c6cdb8b11865b
Parents: a266807 a4a8365
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Fri Oct 23 18:02:45 2015 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Fri Oct 23 18:02:45 2015 +0000

----------------------------------------------------------------------
 core/rest/pom.xml                               |  4 +--
 core/sqf/sqenvcom.sh                            | 28 ++++++++++----------
 core/sqf/sql/scripts/install_local_hadoop       | 13 +++++----
 dcs/pom.xml                                     |  6 ++---
 .../java/org/trafodion/jdbc_test/TestCat.java   |  4 +--
 5 files changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/393eae3c/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/install_local_hadoop
index 7067107,77db26f..66e5494
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@@ -1544,13 -1534,21 +1544,16 @@@ f
  
  cd $MY_SW_ROOT
  
- 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 "------------------------------------------------------------"
+ 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
 -cat >$HOME/.traf-clports-$USER <<EOF
 -HADOOP_START_PORT=$MY_START_PORT
 -EOF
 -
  echo
  echo "Installed directory size and name = $(du -sh $MY_SW_ROOT)" | tee -a ${MY_LOG_FILE}
  echo


Mime
View raw message