Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd091c82 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd091c82 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd091c82 Branch: refs/heads/ignite-1537 Commit: fd091c82892040df8da935527ce72da996fa7718 Parents: 0309f96 7752aa9 Author: Anton Vinogradov <a...@apache.org> Authored: Thu Oct 1 16:26:28 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Thu Oct 1 16:26:28 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 + assembly/dependencies-fabric.xml | 2 +- assembly/release-fabric.xml | 10 ++- examples/schema-import/pom-standalone.xml | 90 ++++++++++++++++++++ examples/schema-import/pom.xml | 13 ++- .../discovery/GridDiscoveryManager.java | 2 +- pom.xml | 9 +- 7 files changed, 119 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/examples/schema-import/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/pom.xml ----------------------------------------------------------------------