Merge remote-tracking branch 'origin/fluo-770'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/0373ec54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/0373ec54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/0373ec54 Branch: refs/heads/master Commit: 0373ec549cfe7fbce7e5bea554194e69fead9617 Parents: 556df6d b8a69cf Author: Keith Turner <ktur...@apache.org> Authored: Fri Sep 16 14:24:56 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Sep 16 14:24:56 2016 -0400 ---------------------------------------------------------------------- .../apache/fluo/api/client/SnapshotBase.java | 104 ++++++++- .../apache/fluo/api/client/TransactionBase.java | 12 +- .../client/TestDefaultTransactionMethods.java | 210 +++++++++++++++++++ .../apache/fluo/core/impl/TransactionImpl.java | 36 ---- .../org/apache/fluo/core/impl/TxStringUtil.java | 64 ------ .../fluo/core/log/TracingTransaction.java | 37 ---- .../fluo/integration/TestTransaction.java | 36 ---- 7 files changed, 316 insertions(+), 183 deletions(-) ----------------------------------------------------------------------
