merge [TRAFODION-3003]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6e39af24 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6e39af24 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6e39af24 Branch: refs/heads/master Commit: 6e39af24401da60402696ab078d3f48218173d67 Parents: c826bce 8cd59bf Author: Liu Ming <[email protected]> Authored: Mon Apr 16 21:03:51 2018 +0000 Committer: Liu Ming <[email protected]> Committed: Mon Apr 16 21:03:51 2018 +0000 ---------------------------------------------------------------------- core/conn/odbc/src/odbc/Common/Global.h | 15 +++- core/conn/odbc/src/odbc/Common/Listener.h | 9 ++- .../odbc/nsksrvr/Interface/Listener_srvr.cpp | 31 +++++++- .../src/odbc/nsksrvr/Interface/Listener_srvr.h | 4 +- .../Interface/linux/Listener_srvr_ps.cpp | 7 +- core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp | 84 +++++++++++++++++++- core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 2 +- .../main/java/org/trafodion/dcs/Constants.java | 25 +++++- .../org/trafodion/dcs/server/ServerManager.java | 24 ++++++ dcs/src/main/resources/dcs-default.xml | 31 ++++++++ 10 files changed, 222 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
