Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8574A18323 for ; Sat, 9 Jan 2016 01:28:01 +0000 (UTC) Received: (qmail 77923 invoked by uid 500); 9 Jan 2016 01:28:01 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 77893 invoked by uid 500); 9 Jan 2016 01:28:01 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 77883 invoked by uid 99); 9 Jan 2016 01:28:01 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jan 2016 01:28:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E0033C17B8 for ; Sat, 9 Jan 2016 01:28:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id OhTcFeqKjYeX for ; Sat, 9 Jan 2016 01:27:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id EC67F213A3 for ; Sat, 9 Jan 2016 01:27:45 +0000 (UTC) Received: (qmail 77438 invoked by uid 99); 9 Jan 2016 01:27:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jan 2016 01:27:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD737E0249; Sat, 9 Jan 2016 01:27:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arvindn@apache.org To: commits@trafodion.incubator.apache.org Date: Sat, 09 Jan 2016 01:27:49 -0000 Message-Id: <9550e45ef4ec44b39f1fdb2ac21807cb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/12] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch 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 Authored: Thu Jan 7 04:33:51 2016 +0000 Committer: Anuradha Hegde 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(-) ----------------------------------------------------------------------