Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb639a0b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb639a0b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb639a0b Branch: refs/heads/ignite-9720 Commit: fb639a0bafa8b0ee52b6e7cc9a788efc862a79d8 Parents: 72705a9 371586a Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Wed Nov 28 19:00:31 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Wed Nov 28 19:00:31 2018 +0300 ---------------------------------------------------------------------- .../preloader/latch/ExchangeLatchManager.java | 2 +- .../distributed/CacheExchangeMergeTest.java | 4 +- ...ptimisticTxSuspendResumeMultiServerTest.java | 30 --- .../IgniteOptimisticTxSuspendResumeTest.java | 228 +++++++++++++------ ...OptimisticPrepareOnUnstableTopologyTest.java | 164 ++++++------- .../transactions/TxRollbackOnTimeoutTest.java | 3 +- .../ignite/testframework/GridTestUtils.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 2 - 8 files changed, 239 insertions(+), 200 deletions(-) ----------------------------------------------------------------------
