You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/11/06 17:54:28 UTC
[2/2] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into upsert1
Merge branch 'master' of github.com:apache/incubator-trafodion into upsert1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/392b99b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/392b99b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/392b99b9
Branch: refs/heads/master
Commit: 392b99b96e9e87b5e42a62df7f919d96ed89d990
Parents: e7dd420 986d4fe
Author: Suresh Subbiah <su...@apache.org>
Authored: Thu Nov 5 23:53:19 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Thu Nov 5 23:53:19 2015 +0000
----------------------------------------------------------------------
.rat-excludes | 1 -
DISCLAIMER.txt | 12 +
LICENSE.txt | 271 +
NOTICE.txt | 2 +-
RAT_README.txt | 158 +-
README.txt | 35 +
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 4 +-
core/sqf/sql/scripts/install_traf_components | 1 +
.../transactional/SplitBalanceHelper.java | 2 +-
core/sql/optimizer/NAColumn.cpp | 24 +
core/sql/optimizer/NAColumn.h | 3 +
core/sql/optimizer/NAFileSet.cpp | 14 +
core/sql/optimizer/NAFileSet.h | 2 +
core/sql/optimizer/OptPhysRelExpr.cpp | 123 +-
core/sql/optimizer/ScmCostMethod.cpp | 13 +-
core/sql/regress/hive/EXPECTED018 | 176 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 7 -
core/sql/sqlcomp/nadefaults.cpp | 6 +-
core/sql/ustat/hs_cli.cpp | 204 +-
dcs/pom.xml | 8 +-
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 7 +-
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 7 +-
.../org/trafodion/dcs/master/ServerManager.java | 3 +-
.../master/datatables/license-gpl2.txt | 339 -
.../resources/dcs-webapps/master/servers.jsp | 34 +-
.../main/resources/dcs-webapps/static/dcs.css | 16 +-
.../java/org/trafodion/jdbc_test/TestCat.java | 6 +-
dcs/src/test/pytests/.env.sh.tmpl | 2 +-
dcs/src/test/pytests/.odbc.ini.tmpl | 2 -
install/installer/traf_cloudera_mods98 | 96 +-
install/installer/traf_config | 297 +
install/installer/traf_config_setup | 22 +-
install/installer/traf_getHadoopNodes | 25 +-
install/installer/traf_hortonworks_mods98 | 9 +
install/installer/traf_start | 290 +-
.../installer/trafodion_apache_hadoop_install | 6 +-
install/installer/trafodion_install | 35 +-
install/installer/trafodion_license | 27 +-
readme.md | 5 -
tests/phx/phoenix_test.py | 2 +-
.../SetCertificateDirReg.rc | 222 +-
.../SetCertificateDirReg_os.vcxproj | 390 +-
.../SetCertificateDirReg_os.vcxproj.filters | 104 +-
.../SetCertificateDirReg_os.vcxproj.user | 4 +-
.../SetCertificateDirReg/odbccp32.props | 34 +-
.../SetCertificateDirReg/resource.h | 40 +-
.../SetCertificateDirReg_os.sln | 52 +-
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 200 -
.../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj | 170 -
.../UpdateDSN/UpdateDSN.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj | 104 -
.../UpdateDSN/UpdateDSN_os.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN_os.vcxproj.user | 3 -
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 28 -
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 37 -
win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln | 26 -
.../Install/win64_installer/installer.iss | 200 +
.../win64_installer/win64_installer_os.ism | 6029 ------------------
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 12 +-
.../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 4 +-
.../odbcclient/Drvr35Res/res/Drvr35Res.rc2 | 26 +-
win-odbc64/odbcclient/README.txt | 111 +-
.../odbcclient/TranslationDll/TranslationDll.rc | 12 +-
.../TranslationDll/TranslationDll_os.vcxproj | 4 +-
win-odbc64/odbcclient/build_os.bat | 333 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 12 +-
.../drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 12 +-
.../drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/drvr35.rc | 12 +-
win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 16 +-
.../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 5 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 12 +-
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 2 +-
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 2 +-
win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 12 +-
.../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 4 +-
win-odbc64/odbcclient/odbcclient_os.sln | 17 +-
win-odbc64/odbcclient/pkg.bat | 38 -
80 files changed, 2205 insertions(+), 8468 deletions(-)
----------------------------------------------------------------------