Merge remote branch 'origin/pr/221/head' into mrg_89
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d95f8ffb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d95f8ffb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d95f8ffb Branch: refs/heads/master Commit: d95f8ffb30ad076f3867a02beeba2c41e2b3e997 Parents: d61ac8a 810003e Author: Suresh Subbiah <[email protected]> Authored: Fri Dec 11 01:50:56 2015 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Fri Dec 11 01:50:56 2015 +0000 ---------------------------------------------------------------------- .../transactional/TrxTransactionState.java | 114 ++++++++++++------- 1 file changed, 70 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d95f8ffb/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java ----------------------------------------------------------------------
