Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abc90ec9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abc90ec9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abc90ec9 Branch: refs/heads/ignite-718 Commit: abc90ec973dae4b57a04d27a3b377a33634c82f7 Parents: f475b07 60640de Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 10 19:20:49 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 10 19:20:49 2015 +0700 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 4 -- .../java/org/apache/ignite/IgniteState.java | 2 +- .../configuration/IgniteConfiguration.java | 16 ++--- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../discovery/GridDiscoveryManager.java | 4 +- .../node/VisorSegmentationConfiguration.java | 4 +- .../segmentation/GridSegmentationPolicy.java | 47 -------------- .../segmentation/GridSegmentationResolver.java | 64 ------------------- .../plugin/segmentation/SegmentationPolicy.java | 49 +++++++++++++++ .../segmentation/SegmentationResolver.java | 65 ++++++++++++++++++++ .../internal/GridLifecycleAwareSelfTest.java | 2 +- 11 files changed, 130 insertions(+), 131 deletions(-) ----------------------------------------------------------------------
