IGNITE-1702 - Prepare for merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f49067fd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f49067fd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f49067fd Branch: refs/heads/ignite-1702 Commit: f49067fd22282954508567fbf6bb71299bbebb1a Parents: 50cf42a ee76924 Author: Alexey Goncharuk <[email protected]> Authored: Mon Oct 19 16:29:50 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Oct 19 16:29:50 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxFinishFuture.java | 4 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 24 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 34 +++- .../dht/atomic/GridDhtAtomicCache.java | 7 +- .../distributed/near/GridNearLockFuture.java | 7 - .../cache/distributed/near/GridNearTxLocal.java | 12 +- .../cache/transactions/IgniteTxHandler.java | 8 +- .../CachePutEventListenerErrorSelfTest.java | 179 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 9 files changed, 245 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
