Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin
# Conflicts: # modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f006bfb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f006bfb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f006bfb8 Branch: refs/heads/ignite-5578 Commit: f006bfb88ae949de1509c01654aaf99566521b58 Parents: 5307bcb b3bce81 Author: sboikov <[email protected]> Authored: Wed Jul 19 08:22:38 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Jul 19 08:22:38 2017 +0300 ---------------------------------------------------------------------- examples/pom.xml | 7 + .../discovery/GridDiscoveryManager.java | 38 ++++- .../cache/query/GridCacheQueryResponse.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../IgniteClusterActivateDeactivateTest.java | 9 +- .../cache/IgniteDynamicCacheMultinodeTest.java | 171 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite4.java | 2 + modules/geospatial/pom.xml | 24 +++ modules/hibernate-4.2/pom.xml | 24 +++ modules/hibernate-5.1/pom.xml | 24 +++ modules/schedule/pom.xml | 24 +++ 11 files changed, 319 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f006bfb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java ----------------------------------------------------------------------
