You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/28 03:41:10 UTC
[3/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6046ef70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6046ef70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6046ef70
Branch: refs/heads/master
Commit: 6046ef706ba2fdbdc015f666b602138055e2c55f
Parents: f13f269 7cf4caa
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Oct 27 04:55:35 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Oct 27 04:55:35 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 28 +-
core/sqf/sql/scripts/genms | 3 +
core/sqf/sql/scripts/install_local_hadoop | 13 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 4 +-
core/sql/comexe/ComTdbHbaseAccess.h | 6 +
core/sql/executor/ExHbaseIUD.cpp | 6 +-
core/sql/generator/GenExplain.cpp | 8 +
core/sql/generator/GenRelUpdate.cpp | 9 +
core/sql/generator/GenUdr.cpp | 5 +-
core/sql/optimizer/NAColumn.cpp | 4 +-
core/sql/optimizer/NAColumn.h | 2 +-
core/sql/optimizer/ScanOptimizer.cpp | 17 +-
core/sql/regress/hive/EXPECTED020 | 63 +-
core/sql/regress/hive/TEST020 | 27 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +-
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 983 ++++++++++---------
dcs/bin/dcs-daemon.sh | 6 +-
dcs/pom.xml | 8 +-
.../org/trafodion/dcs/master/DcsMaster.java | 7 +-
.../org/trafodion/dcs/servermt/DcsServer.java | 5 +
.../java/org/trafodion/jdbc_test/TestCat.java | 4 +-
install/traf_tools_setup.sh | 378 ++++---
pom.xml | 2 +-
26 files changed, 932 insertions(+), 670 deletions(-)
----------------------------------------------------------------------