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 43EC817609 for ; Thu, 9 Apr 2015 17:07:07 +0000 (UTC) Received: (qmail 21500 invoked by uid 500); 9 Apr 2015 17:07:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 21439 invoked by uid 500); 9 Apr 2015 17:07:07 -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 21423 invoked by uid 99); 9 Apr 2015 17:07:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 17:07:07 +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; Thu, 09 Apr 2015 17:06:45 +0000 Received: (qmail 20024 invoked by uid 99); 9 Apr 2015 17:06:43 -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; Thu, 09 Apr 2015 17:06:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E867E0009; Thu, 9 Apr 2015 17:06:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 17:06:50 -0000 Message-Id: <4e237fedec0a4c3fae1e11f8ece4c2f7@git.apache.org> In-Reply-To: <3c72e2cac5aa4b2c97d563ff0fa38870@git.apache.org> References: <3c72e2cac5aa4b2c97d563ff0fa38870@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] incubator-ignite git commit: Merge branch 'ignite-sprint-3' into gg-10046 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-3' into gg-10046 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf058808 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf058808 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf058808 Branch: refs/heads/gg-10046 Commit: cf058808bb5bedfcbc491f842c6162af8f850a7d Parents: d84bccd a60f47d Author: Artem Shutak Authored: Thu Apr 9 20:06:31 2015 +0300 Committer: Artem Shutak Committed: Thu Apr 9 20:06:31 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../query/h2/sql/GridSqlQueryParser.java | 24 ++++++++++++++------ .../query/h2/sql/BaseH2CompareQueryTest.java | 12 ++++++---- .../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 ++++++++-------- .../scala/org/apache/ignite/visor/visor.scala | 3 +++ 15 files changed, 48 insertions(+), 33 deletions(-) ----------------------------------------------------------------------