Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66a1b3c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66a1b3c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66a1b3c8 Branch: refs/heads/ignite-485 Commit: 66a1b3c80dc9742edf4301ae1cb2018896a9eaa7 Parents: bd80bca 9c0ef57 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 14 16:21:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 14 16:21:57 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearCacheEntry.java | 6 ++-- .../GridCacheAbstractFailoverSelfTest.java | 37 ++++++++++++++++---- .../processors/cache/GridCachePutAllTask.java | 23 +++++++++--- .../junits/common/GridCommonAbstractTest.java | 36 ++++++++++++++++++- .../IgniteCacheFailoverTestSuite.java | 2 +- 5 files changed, 90 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
