Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 875FD17387 for ; Mon, 6 Apr 2015 15:47:46 +0000 (UTC) Received: (qmail 4102 invoked by uid 500); 6 Apr 2015 15:47:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 4067 invoked by uid 500); 6 Apr 2015 15:47:46 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 4058 invoked by uid 99); 6 Apr 2015 15:47:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 15:47:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Apr 2015 15:47:44 +0000 Received: (qmail 3467 invoked by uid 99); 6 Apr 2015 15:47:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 15:47:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B0B1E180F; Mon, 6 Apr 2015 15:47:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 06 Apr 2015 15:47:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/24] 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 X-Virus-Checked: Checked by ClamAV on apache.org 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-593 Commit: 5397a4159d6f31740dd1c47971cb3856e9c29c48 Parents: fe57a53 7e07b90 Author: AKuznetsov Authored: Mon Apr 6 22:45:36 2015 +0700 Committer: AKuznetsov 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(-) ----------------------------------------------------------------------