Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-738-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bed9781c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bed9781c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bed9781c Branch: refs/heads/ignite-485 Commit: bed9781c247047a0d08444027d7c36fd8c0ed9fb Parents: edbfcf7 9c0ef57 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 14 16:34:24 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 14 16:34:24 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(-) ----------------------------------------------------------------------
