You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/08/19 19:04:08 UTC
[6/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into TRAFODION-2034
Merge branch 'master' of github.com:apache/incubator-trafodion into TRAFODION-2034
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f5520bc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f5520bc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f5520bc9
Branch: refs/heads/master
Commit: f5520bc917231a9906073e9041997d51aca11503
Parents: 020cc75 0a31bbb
Author: Amanda Moran <am...@apache.com>
Authored: Tue Aug 16 18:25:25 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue Aug 16 18:25:25 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/install_features | 2 +
core/sqf/sqenvcom.sh | 49 +--
core/sqf/sql/scripts/install_local_hadoop | 5 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 39 ++-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 336 +++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pp.awk | 10 +-
.../hbase/client/PatchClientScanner.java.tmpl | 2 +-
.../transactional/SsccRegionEndpoint.java.tmpl | 25 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 49 ++-
.../transactional/TrxRegionObserver.java.tmpl | 16 +-
.../CleanOldTransactionsChore.java.tmpl | 9 +-
.../transactional/KeyValueListScanner.java.tmpl | 14 +-
.../transactional/MemoryUsageChore.java.tmpl | 6 +-
.../transactional/TrxTransactionState.java.tmpl | 27 +-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 2 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 4 +-
core/sql/nskgmake/Makerules.mk | 2 +-
core/sql/pom.xml | 2 +-
core/sql/pom.xml.apache | 6 +-
core/sql/pom.xml.hdp | 2 +-
install/installer/traf_add_user | 2 -
install/installer/traf_apache_mods | 15 +-
install/installer/traf_cloudera_mods | 14 +-
install/installer/traf_config_check | 127 ++++---
install/installer/traf_getHadoopNodes | 45 ++-
install/installer/trafodion_install | 22 +-
31 files changed, 994 insertions(+), 180 deletions(-)
----------------------------------------------------------------------