Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/747c6848 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/747c6848 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/747c6848 Branch: refs/heads/ignite-1537 Commit: 747c68488ef71b54d124a54ffdccbe4229f1d899 Parents: 4c1b9d2 195cd57 Author: ashutak <ashu...@gridgain.com> Authored: Mon Nov 2 14:56:46 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Mon Nov 2 14:56:46 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridCacheTxRecoveryFuture.java | 13 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 44 +-- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../service/GridServiceProcessor.java | 31 +- .../CacheSerializableTransactionsTest.java | 313 ++++++++++++------- .../GridServiceProcessorStopSelfTest.java | 103 ++++++ .../testsuites/IgniteKernalSelfTestSuite.java | 2 + 8 files changed, 376 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
