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 0DC7510DEB for ; Fri, 4 Sep 2015 08:01:07 +0000 (UTC) Received: (qmail 44020 invoked by uid 500); 4 Sep 2015 08:01:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43950 invoked by uid 500); 4 Sep 2015 08:01:06 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 43931 invoked by uid 99); 4 Sep 2015 08:01:06 -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; Fri, 04 Sep 2015 08:01:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4534E0F7B; Fri, 4 Sep 2015 08:01:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.apache.org Date: Fri, 04 Sep 2015 08:01:07 -0000 Message-Id: <52d7a81ef702400981181c6c6d7f2c99@git.apache.org> In-Reply-To: <0cff424f1c3c46d3acc689cc58b571b6@git.apache.org> References: <0cff424f1c3c46d3acc689cc58b571b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4 Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/826cb2f3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/826cb2f3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/826cb2f3 Branch: refs/heads/ignite-1.4 Commit: 826cb2f3b4bf1637fa607dcd148c53335bfb7c3f Parents: bf64c6e 1f6d2ff Author: S.Vladykin Authored: Fri Sep 4 10:51:51 2015 +0300 Committer: S.Vladykin Committed: Fri Sep 4 10:51:51 2015 +0300 ---------------------------------------------------------------------- .../CacheClientPortablePutGetExample.java | 4 + .../CacheClientPortableQueryExample.java | 5 + .../configuration/CacheConfiguration.java | 31 ++-- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../dht/GridPartitionedGetFuture.java | 14 +- .../distributed/near/GridNearGetFuture.java | 13 ++ .../query/GridCacheDistributedQueryFuture.java | 5 +- .../query/GridCacheDistributedQueryManager.java | 9 +- .../cache/query/GridCacheQueryManager.java | 177 ++++++------------- .../cache/query/GridCacheQueryRequest.java | 59 ++++++- .../IgniteCacheP2pUnmarshallingErrorTest.java | 5 - .../IgniteCacheNodeJoinAbstractTest.java | 42 +++++ .../testsuites/IgniteCacheTestSuite3.java | 3 +- 13 files changed, 212 insertions(+), 165 deletions(-) ----------------------------------------------------------------------