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/10/22 01:56:52 UTC
[6/6] incubator-trafodion git commit: Merge remote branch
'origin/pr/137/head' into mrg_68
Merge remote branch 'origin/pr/137/head' into mrg_68
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5360a1d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5360a1d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5360a1d4
Branch: refs/heads/master
Commit: 5360a1d455c7ed3c7a53981fb349f860e78af55b
Parents: 63b124a 815fc9b
Author: Suresh Subbiah <su...@apache.org>
Authored: Wed Oct 21 23:56:24 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Wed Oct 21 23:56:24 2015 +0000
----------------------------------------------------------------------
.../transactional/TransactionManager.java | 204 +-
.../client/transactional/TransactionState.java | 10 +
.../transactional/TransactionalReturn.java | 1 +
.../transactional/TransactionalTable.java | 285 +-
.../transactional/SplitBalanceHelper.java | 296 ++
.../transactional/TrxRegionEndpoint.java | 272 +-
.../transactional/TrxRegionObserver.java | 232 +-
.../generated/TrxRegionProtos.java | 3001 +++++++++++++++++-
.../transactional/TransactionState.java | 13 +
.../transactional/TrxTransactionState.java | 6 +
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 21 +
11 files changed, 4067 insertions(+), 274 deletions(-)
----------------------------------------------------------------------