Merge branch 'ignite-gg-12221' into ignite-gg-8.0.3.ea9
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d3f86fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d3f86fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d3f86fa Branch: refs/heads/ignite-5398 Commit: 6d3f86faeaa312f6bcba60983461a516502c9b7b Parents: 22d15b5 097e7c5 Author: Dmitriy Govorukhin <[email protected]> Authored: Wed May 31 15:50:56 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed May 31 15:50:56 2017 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 29 +++++- .../cache/DynamicCacheChangeBatch.java | 4 +- .../processors/cache/GridCacheProcessor.java | 100 +++++++++++++------ .../cluster/GridClusterStateProcessor.java | 36 ++++++- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../testframework/junits/GridAbstractTest.java | 7 ++ 6 files changed, 142 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
