Merge branch 'ignite-gg-12335' into ignite-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/599d1a8f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/599d1a8f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/599d1a8f Branch: refs/heads/ignite-2.1.2-exchange Commit: 599d1a8f240718913aa77fd2a1c5997e8249f46f Parents: 42e8ca6 369133a Author: Dmitriy Govorukhin <[email protected]> Authored: Sat Jun 17 22:18:26 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Sat Jun 17 22:18:26 2017 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 2 +- .../ignite/internal/processors/cache/ClusterCachesInfo.java | 2 +- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 ++++++-- .../processors/cluster/GridClusterStateProcessor.java | 2 ++ .../standbycluster/IgniteChangeGlobalStateTest.java | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
