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 1EB50185EF for ; Wed, 6 Jan 2016 21:42:51 +0000 (UTC) Received: (qmail 8429 invoked by uid 500); 6 Jan 2016 21:42:51 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 8399 invoked by uid 500); 6 Jan 2016 21:42:51 -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 8390 invoked by uid 99); 6 Jan 2016 21:42:51 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2016 21:42:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9B3B4C23D2 for ; Wed, 6 Jan 2016 21:42:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.779 X-Spam-Level: * X-Spam-Status: No, score=1.779 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 5r4a94hFfePU for ; Wed, 6 Jan 2016 21:42:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 0D4DF31ABF for ; Wed, 6 Jan 2016 21:42:48 +0000 (UTC) Received: (qmail 8167 invoked by uid 99); 6 Jan 2016 21:42:48 -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; Wed, 06 Jan 2016 21:42:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C6B2DFFF0; Wed, 6 Jan 2016 21:42:48 +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: Wed, 06 Jan 2016 21:42:49 -0000 Message-Id: <01f8678760e74f0d9ba311ee8f1c6ddd@git.apache.org> In-Reply-To: <44e1392587e24e09a91d4f15d918d9cd@git.apache.org> References: <44e1392587e24e09a91d4f15d918d9cd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-trafodion git commit: Merge [TRAFODION-1736] PR-247 REST server reports duplicate DCS connections Merge [TRAFODION-1736] PR-247 REST server reports duplicate DCS connections Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/37849041 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/37849041 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/37849041 Branch: refs/heads/master Commit: 37849041fcae350f54a051d70c7d4ae5b9b83979 Parents: 27dbcce a204166 Author: Arvind Narain Authored: Wed Jan 6 21:41:32 2016 +0000 Committer: Arvind Narain Committed: Wed Jan 6 21:41:32 2016 +0000 ---------------------------------------------------------------------- .../src/main/java/org/trafodion/rest/GetStatusResponse.java | 2 +- core/rest/src/main/java/org/trafodion/rest/RESTServlet.java | 7 +++++++ .../java/org/trafodion/rest/provider/JAXBContextResolver.java | 1 - .../rest/provider/producer/PlainTextMessageBodyProducer.java | 3 --- core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java | 2 +- .../src/main/java/org/trafodion/rest/zookeeper/ZkClient.java | 1 - 6 files changed, 9 insertions(+), 7 deletions(-) ----------------------------------------------------------------------