merge [TRAFODION-3164]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/9c59d780 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/9c59d780 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/9c59d780 Branch: refs/heads/master Commit: 9c59d78036f7135dbafe4c27d5ce6902ba5f5486 Parents: 4ec0da8 99da63e Author: Liu Ming <ovis_p...@sina.com> Authored: Sun Aug 5 07:25:17 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Sun Aug 5 07:25:17 2018 +0000 ---------------------------------------------------------------------- core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp | 40 +++++++++++++++++++- .../org/trafodion/dcs/master/DcsMaster.java | 6 ++- 2 files changed, 44 insertions(+), 2 deletions(-) ----------------------------------------------------------------------