Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/adb07b05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/adb07b05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/adb07b05 Branch: refs/heads/master Commit: adb07b05b656938b183511bd488c305fa1fd7582 Parents: b1aff16 da4f24f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 12 17:21:09 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 12 17:21:09 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 111 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 4 files changed, 117 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adb07b05/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ----------------------------------------------------------------------
