You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafodion.apache.org by ar...@apache.org on 2016/01/06 22:42:49 UTC

[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 <ar...@apache.org>
Authored: Wed Jan 6 21:41:32 2016 +0000
Committer: Arvind Narain <ar...@apache.org>
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(-)
----------------------------------------------------------------------