You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/07 11:12:24 UTC
[20/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-593' and 'ignite-sprint-3' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5397a415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5397a415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5397a415
Branch: refs/heads/ignite-680
Commit: 5397a4159d6f31740dd1c47971cb3856e9c29c48
Parents: fe57a53 7e07b90
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Apr 6 22:45:36 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Apr 6 22:45:36 2015 +0700
----------------------------------------------------------------------
.../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 +++++++++++++
.../processors/query/GridQueryProcessor.java | 8 +-
.../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 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +++-
.../h2/twostep/GridReduceQueryExecutor.java | 13 ++-
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 ++
modules/schedule/pom.xml | 20 ++++
pom.xml | 2 +
25 files changed, 252 insertions(+), 227 deletions(-)
----------------------------------------------------------------------