Merge remote branch 'origin/pr/173/head' into mrg_83
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ed09cc1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ed09cc1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ed09cc1d Branch: refs/heads/master Commit: ed09cc1d9edfdea760b298b3601898e127b1c478 Parents: 0ebc219 982804b Author: Suresh Subbiah <[email protected]> Authored: Tue Nov 17 16:56:42 2015 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Tue Nov 17 16:56:42 2015 +0000 ---------------------------------------------------------------------- core/rest/pom.xml | 7 +++--- core/sqf/sql/scripts/install_traf_components | 2 +- dcs/pom.xml | 9 ++++---- dcs/src/test/jdbc_test/jdbc_test.py | 23 ++++++++++++++++---- .../java/org/trafodion/jdbc_test/TestCat.java | 9 +++++--- .../java/org/trafodion/jdbc_test/Utils.java | 6 +++++ 6 files changed, 39 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ed09cc1d/core/sqf/sql/scripts/install_traf_components ----------------------------------------------------------------------
