You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/07/19 16:09:26 UTC
[13/13] incubator-trafodion git commit: Merge remote branch
'origin/pr/568/head' into merge_568
Merge remote branch 'origin/pr/568/head' into merge_568
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b7dd48c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b7dd48c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b7dd48c1
Branch: refs/heads/master
Commit: b7dd48c1f4ae4260ed7d609c3404bac4938f769e
Parents: 44660e4 42be08a
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Jul 19 16:06:08 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Jul 19 16:06:08 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/install_features | 2 +
core/sqf/sqenvcom.sh | 49 ++-
core/sqf/sql/scripts/install_local_hadoop | 11 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 87 +++--
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 336 -------------------
.../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 336 +++++++++++++++++++
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 336 +++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh | 332 ------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pp.awk | 40 ++-
.../hbase/client/ClientScanner98.java.tmpl | 2 +-
.../hbase/client/PatchClientScanner.java.tmpl | 2 +-
.../client/TrafParallelClientScanner.java.tmpl | 2 +-
.../transactional/SsccRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionObserver.java.tmpl | 16 +-
.../CleanOldTransactionsChore.java.tmpl | 6 +-
.../transactional/KeyValueListScanner.java.tmpl | 2 +-
.../transactional/MemoryUsageChore.java.tmpl | 6 +-
.../transactional/TrxTransactionState.java.tmpl | 10 +-
install/installer/traf_apache_mods | 6 +-
install/installer/traf_config_check | 72 +++-
23 files changed, 1562 insertions(+), 763 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dd48c1/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dd48c1/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------