Merge branch 'master' of github.com:apache/incubator-trafodion into predicatePushdownV2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7627df3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7627df3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7627df3 Branch: refs/heads/master Commit: d7627df335479cb5448c8f5924aaebc9a28f46d7 Parents: e1cdc43 b6f49b6 Author: Eric Owhadi <[email protected]> Authored: Tue Jan 19 14:28:26 2016 +0000 Committer: Eric Owhadi <[email protected]> Committed: Tue Jan 19 14:28:26 2016 +0000 ---------------------------------------------------------------------- .../java/org/trafodion/rest/RESTServlet.java | 16 ++--- core/sqf/sql/scripts/dcscheck | 2 +- core/sqf/sql/scripts/dcsstop | 2 +- core/sql/optimizer/NATable.cpp | 73 +++++++++++--------- core/sql/sqlcat/desc.h | 1 - core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 18 +---- dcs/bin/scripts/dcsbind.sh | 6 +- dcs/bin/scripts/dcsunbind.sh | 14 ++-- .../Descriptor2List.java | 2 +- .../serverHandler/ServerApiSqlEndTransact.java | 14 +++- .../serverHandler/ServerApiSqlExecDirect.java | 2 +- install/installer/cloud_cli_setup | 16 ++--- install/installer/dcs_installer | 3 +- 13 files changed, 89 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
