Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-965
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb5cc43c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb5cc43c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb5cc43c Branch: refs/heads/ignite-965 Commit: eb5cc43c84508981936c3bac8184013b7f72631d Parents: e77e76a ec9cfca Author: ivasilinets <ivasilin...@gridgain.com> Authored: Sun Jun 21 18:52:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Sun Jun 21 18:52:17 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheIoManager.java | 64 ++++++++++++------ .../GridCachePartitionExchangeManager.java | 70 +++++++++----------- .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 +++++++++++- 4 files changed, 120 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
