Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-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/b141abfd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b141abfd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b141abfd Branch: refs/heads/ignite-471 Commit: b141abfd5c4c4219d17e6a1cc1a7a1677b06b3c0 Parents: 42563f6 07a4258 Author: sboikov <sboi...@gridgain.com> Authored: Wed May 6 09:12:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 6 09:12:56 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 3 +++ .../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------