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 3CBE217AC5 for ; Fri, 19 Jun 2015 10:34:57 +0000 (UTC) Received: (qmail 16974 invoked by uid 500); 19 Jun 2015 10:34:57 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16916 invoked by uid 500); 19 Jun 2015 10:34:57 -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 16890 invoked by uid 99); 19 Jun 2015 10:34:56 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 10:34:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8B940C08D7 for ; Fri, 19 Jun 2015 10:34:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id MgGj_iAeAIF4 for ; Fri, 19 Jun 2015 10:34:56 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 716424E5E6 for ; Fri, 19 Jun 2015 10:34:48 +0000 (UTC) Received: (qmail 16630 invoked by uid 99); 19 Jun 2015 10:34:48 -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, 19 Jun 2015 10:34:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F073CE0283; Fri, 19 Jun 2015 10:34:47 +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: Fri, 19 Jun 2015 10:35:16 -0000 Message-Id: In-Reply-To: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> References: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23ea747 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23ea747 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23ea747 Branch: refs/heads/ignite-950 Commit: b23ea747d9cf351f607d60f520781f5d46e98715 Parents: 08d134d c1eee18 Author: Yakov Zhdanov Authored: Thu Jun 18 13:47:19 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jun 18 13:47:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 +++++ .../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++++++ 2 files changed, 12 insertions(+) ----------------------------------------------------------------------