Merge remote-tracking branch 'remotes/origin/master' into ignite-1758
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bb9c329a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bb9c329a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bb9c329a Branch: refs/heads/ignite-1758 Commit: bb9c329ae0d398e5e2407f4d2599dc90442d8e24 Parents: a55c638 11d177f Author: sboikov <[email protected]> Authored: Mon Nov 2 09:07:11 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 2 09:07:11 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 44 +-- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../CacheSerializableTransactionsTest.java | 313 ++++++++++++------- 4 files changed, 240 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
