You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/24 10:16:52 UTC
[2/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1537' into ignite-1090
Merge remote-tracking branch 'remotes/origin/ignite-1537' into ignite-1090
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/782a0ec9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/782a0ec9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/782a0ec9
Branch: refs/heads/ignite-1090
Commit: 782a0ec982ccad155ede42af3b5a210e232ee412
Parents: b56b15c b6f5b31
Author: sboikov <sb...@gridgain.com>
Authored: Thu Sep 24 10:57:48 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Sep 24 10:57:48 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 134 +++++++++++------
.../cache/local/GridLocalCacheEntry.java | 6 +
.../IgniteCacheCreatePutMultiNodeSelfTest.java | 150 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
5 files changed, 249 insertions(+), 45 deletions(-)
----------------------------------------------------------------------