Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2628bb04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2628bb04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2628bb04 Branch: refs/heads/master Commit: 2628bb04e70ad7058c4eb857bd63d632e75b37ec Parents: 4e30bf0 7e1dfca Author: Anuradha Hegde <[email protected]> Authored: Thu Jan 7 04:33:51 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Thu Jan 7 04:33:51 2016 +0000 ---------------------------------------------------------------------- .rat-excludes | 1 + RAT_README.txt | 1 + .../jdbc_type2/native/SQLMXDatabaseMetaData.cpp | 6 +- core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 +- core/conn/jdbc_type2/native/SrvrSmd.cpp | 7 - core/conn/jdbc_type4/build.xml | 9 +- .../org/trafodion/rest/GetStatusResponse.java | 2 +- .../java/org/trafodion/rest/RESTServlet.java | 7 + .../rest/provider/JAXBContextResolver.java | 1 - .../producer/PlainTextMessageBodyProducer.java | 3 - .../java/org/trafodion/rest/util/ConfTool.java | 2 +- .../org/trafodion/rest/zookeeper/ZkClient.java | 1 - core/sqf/sql/scripts/cleanlogs | 92 ++++++++++++ core/sqf/sql/scripts/dcscheck | 67 ++++++++- core/sqf/sql/scripts/dcsstop | 4 + .../sql/scripts/install_hadoop_regr_test_env | 22 +-- core/sqf/sql/scripts/sqcheck | 52 ++++++- core/sql/sqlcomp/CmpDescribe.cpp | 5 + .../java/org/trafodion/sql/HBaseClient.java | 148 ++++++++++++++----- core/sql/ustat/hs_cli.cpp | 51 ++++++- dcs/bin/dcs-config.sh | 10 ++ dcs/bin/scripts/dcsbind.sh | 133 ++++++++++++++++- dcs/bin/scripts/dcsunbind.sh | 95 ++++++++++++ dcs/bin/scripts/parse_dcs_site.py | 46 ++++++ dcs/bin/start-dcs.sh | 13 +- dcs/bin/stop-dcs.sh | 2 +- dcs/conf/dcs-env.sh | 8 +- dcs/conf/master | 0 dcs/pom.xml | 6 + install/installer/setup_ssh_key | 27 ++++ 30 files changed, 735 insertions(+), 90 deletions(-) ----------------------------------------------------------------------
