Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af5c9d3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af5c9d3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af5c9d3c

Branch: refs/heads/ignite-639
Commit: af5c9d3c9ab1b5d56ab4903a010a038a26443613
Parents: a7ba0be 60aaaaa
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Mon Apr 6 15:56:05 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Mon Apr 6 15:56:05 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridComponent.java   |   2 +-
 .../ignite/internal/GridKernalContextImpl.java  |   3 +-
 .../ignite/internal/GridPluginComponent.java    |   4 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   7 --
 .../apache/ignite/internal/IgniteKernal.java    |  25 +----
 .../ignite/internal/IgniteNodeAttributes.java   |   3 -
 .../internal/managers/GridManagerAdapter.java   |   6 +-
 .../processors/GridProcessorAdapter.java        |   2 +-
 .../processors/cache/GridCacheProcessor.java    |   6 +-
 .../DiscoveryNodeValidationProcessor.java       |  27 +++++
 .../OsDiscoveryNodeValidationProcessor.java     |  72 +++++++++++++
 .../ignite/spi/IgniteNodeValidationResult.java  |  66 ++++++++++++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   2 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   2 +-
 .../spi/IgniteSpiNodeValidationResult.java      |  66 ------------
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 106 +------------------
 .../testframework/GridSpiTestContext.java       |   2 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   5 -
 18 files changed, 186 insertions(+), 220 deletions(-)
----------------------------------------------------------------------


Reply via email to