Merge remote branch 'origin/pr/212/head' into mrg_88
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9ce3c07e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9ce3c07e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9ce3c07e Branch: refs/heads/master Commit: 9ce3c07e35de53580fb5d6276d1b798c2da04e00 Parents: 0b7112f 84af960 Author: Suresh Subbiah <[email protected]> Authored: Tue Dec 8 16:01:34 2015 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Tue Dec 8 16:01:34 2015 +0000 ---------------------------------------------------------------------- core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 4 + .../transactional/TransactionManager.java | 313 +++--- .../transactional/TrxRegionEndpoint.java | 70 +- .../generated/SsccRegionProtos.java | 131 +-- .../generated/TrxRegionProtos.java | 1020 ++++++++++++++---- .../hbase-trx/src/main/protobuf/TrxRegion.proto | 11 +- 6 files changed, 1118 insertions(+), 431 deletions(-) ----------------------------------------------------------------------
