Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 98BBE200C80 for ; Thu, 25 May 2017 15:28:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 97787160BCA; Thu, 25 May 2017 13:28:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BA1C1160BDE for ; Thu, 25 May 2017 15:28:25 +0200 (CEST) Received: (qmail 55722 invoked by uid 500); 25 May 2017 13:28:25 -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 55433 invoked by uid 99); 25 May 2017 13:28:23 -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, 25 May 2017 13:28:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 481D5E9641; Thu, 25 May 2017 13:28:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Thu, 25 May 2017 13:28:30 -0000 Message-Id: <64a6a915d9014130aeeb650b7474eaea@git.apache.org> In-Reply-To: <17c31049a14a4446ae319bf77df8373e@git.apache.org> References: <17c31049a14a4446ae319bf77df8373e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] ignite git commit: Merge branch 'ignite-2.0.2.b1' into ignite-2.0.2 archived-at: Thu, 25 May 2017 13:28:26 -0000 Merge branch 'ignite-2.0.2.b1' into ignite-2.0.2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed37bd47 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed37bd47 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed37bd47 Branch: refs/heads/ignite-5232 Commit: ed37bd478aabb1760833de3f5730460700a153f3 Parents: cfe1e51 0c45750 Author: Andrey V. Mashenkov Authored: Tue May 23 15:10:55 2017 +0300 Committer: Andrey V. Mashenkov Committed: Tue May 23 15:10:55 2017 +0300 ---------------------------------------------------------------------- .../query/h2/twostep/GridMergeIndexSorted.java | 3 + .../query/IgniteSqlSplitterSelfTest.java | 68 ++++++++++++++++++++ 2 files changed, 71 insertions(+) ----------------------------------------------------------------------