You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/25 20:35:01 UTC
[39/39] incubator-trafodion git commit: Merge [TRAFODION-1977] PR 493
Merge latest release2.0 into master
Merge [TRAFODION-1977] PR 493 Merge latest release2.0 into master
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c8305589
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c8305589
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c8305589
Branch: refs/heads/master
Commit: c8305589885784c2a45bfdc7eae744423bd4f1fe
Parents: 39ae473 60ef89d
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 25 20:33:09 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 25 20:33:09 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 40 +-
core/rest/src/assembly/all.xml | 11 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
core/sqf/sql/scripts/install_traf_components | 50 +-
.../TransactionalScanner.java.tmpl | 2 +-
.../transactional/SplitBalanceHelper.java | 51 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
install/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +-
install/installer/traf_config_check | 44 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
43 files changed, 2207 insertions(+), 4186 deletions(-)
----------------------------------------------------------------------