Merge branches 'ignite-426' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-426
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01b5f569 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01b5f569 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01b5f569 Branch: refs/heads/ignite-426 Commit: 01b5f56970f2535347fc858299afcd8a566ac5ef Parents: 9fe0a8d ae11e9b Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Aug 11 00:02:27 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Aug 11 00:02:27 2015 -0700 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 32 ++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
