Merge branches 'ignite-858' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07a4258d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07a4258d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07a4258d Branch: refs/heads/ignite-gg-10186 Commit: 07a4258d9ac04f36536122827c423ebb2e8cd70f Parents: 54f9492 4a7d43a Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue May 5 16:00:39 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue May 5 16:00:39 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 3 +++ .../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
