Merge branch 'master' of github.com:apache/incubator-trafodion into traf_properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e112e95d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e112e95d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e112e95d Branch: refs/heads/master Commit: e112e95ddd7476ac8959b8ec8ba99c00c3ea6a13 Parents: 78a5f20 fe07eda Author: selvaganesang <selva.govindara...@esgyn.com> Authored: Wed Oct 26 20:45:48 2016 +0000 Committer: selvaganesang <selva.govindara...@esgyn.com> Committed: Wed Oct 26 20:45:48 2016 +0000 ---------------------------------------------------------------------- .gitignore | 1 + core/Makefile | 54 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 26 + .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 1 + core/sqf/monitor/linux/cluster.cxx | 104 +++- core/sqf/monitor/linux/internal.h | 3 +- core/sqf/monitor/linux/monitor.cxx | 1 + core/sqf/monitor/linux/pnode.cxx | 2 - core/sqf/monitor/linux/pnode.h | 7 +- core/sqf/monitor/linux/zclient.cxx | 41 ++ core/sqf/sqenvcom.sh | 12 +- core/sqf/sql/scripts/install_local_hadoop | 14 +- core/sqf/src/seatrans/hbase-trx/Makefile | 6 +- .../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 2 +- .../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +- .../sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 2 +- .../transactional/TrxRegionEndpoint.java.tmpl | 2 +- core/sql/regress/executor/DIFF107.KNOWN.SB | 16 - core/sql/regress/executor/DIFF107.KNOWN.SB.OS | 14 - core/sql/regress/executor/EXPECTED107 | 565 ++++++++++++++++++ core/sql/regress/executor/EXPECTED107.LINUX | 574 ------------------- core/sql/regress/executor/TEST107 | 51 +- core/sql/regress/privs2/EXPECTED144 | Bin 0 -> 59186 bytes core/sql/regress/privs2/LOG144 | Bin 0 -> 17980 bytes core/sql/regress/privs2/TEST144 | 241 ++++++++ core/sql/regress/privs2/udfs.cpp | 174 ++++++ core/sql/regress/udr/TEST103 | 2 +- core/sql/sort/SortTopN.cpp | 8 + core/sql/sqludr/SqlUdrPredefLogReader.cpp | 482 ++++++++++++++-- core/trafodion.spec | 114 ++++ 30 files changed, 1766 insertions(+), 755 deletions(-) ----------------------------------------------------------------------
