Merge remote-tracking branch 'origin/sprint-2' 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/795e2fba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/795e2fba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/795e2fba Branch: refs/heads/master Commit: 795e2fba07c457fc040cf4f0d3a869968d3435fc Parents: 2f518ae adb07b0 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Mar 12 17:35:12 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Mar 12 17:35:12 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 111 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 5 files changed, 120 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
