Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da1909cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da1909cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da1909cc Branch: refs/heads/ignite-843 Commit: da1909cc358e4a6953dd74949c3a521eb33cf41c Parents: 8d8e0fa ae11e9b Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Aug 11 16:56:44 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Aug 11 16:56:44 2015 +0700 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 32 ++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
