Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1c1cf94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1c1cf94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1c1cf94 Branch: refs/heads/ignite-sprint-3 Commit: c1c1cf9433190e2ae944b1559ec94a2c925d7f7b Parents: 88e1ff8 845787c Author: sboikov <sboi...@gridgain.com> Authored: Fri Apr 10 08:59:33 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Apr 10 08:59:33 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 4 +- .../java/org/apache/ignite/IgniteCache.java | 6 ++- .../processors/cache/GridCacheAdapter.java | 25 +++++++----- .../distributed/dht/GridDhtLockFuture.java | 3 +- .../GridCacheAffinityBackupsSelfTest.java | 15 ++++---- .../cache/GridCacheAbstractFullApiSelfTest.java | 13 ++++--- .../GridCacheAbstractIteratorsSelfTest.java | 3 +- .../cache/GridCacheAbstractSelfTest.java | 10 ++--- .../cache/GridCacheClearAllSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 9 +++-- .../GridCachePreloadingEvictionsSelfTest.java | 23 +++++------ .../cache/GridCacheSwapPreloadSelfTest.java | 5 ++- .../cache/IgniteCachePeekModesAbstractTest.java | 40 ++++++++++---------- .../GridCacheMultiNodeAbstractTest.java | 13 ++++--- .../dht/GridCacheDhtEntrySelfTest.java | 12 +++--- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 26 ++++++------- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 6 +-- .../near/IgniteCacheNearReadCommittedTest.java | 4 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 5 ++- .../GridCacheReplicatedPreloadSelfTest.java | 23 ++++++----- .../junits/common/GridCommonAbstractTest.java | 13 ++++++- ...CacheOffheapTieredMultithreadedSelfTest.java | 4 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +++---- .../IgniteCacheQuerySelfTestSuite.java | 1 + 26 files changed, 157 insertions(+), 126 deletions(-) ----------------------------------------------------------------------
