Merge remote branch 'origin/pr/1607/head' into merge_1607
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8001c154 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8001c154 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8001c154 Branch: refs/heads/master Commit: 8001c1549deefa77ac7bdf379a4b1f4bbdb5aa3f Parents: 877339a 2713db9 Author: Sandhya Sundaresan <[email protected]> Authored: Fri Jun 15 18:58:20 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Fri Jun 15 18:58:20 2018 +0000 ---------------------------------------------------------------------- .../java/org/trafodion/dcs/server/ServerManager.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
