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 B0D1E200C24 for ; Wed, 18 Jan 2017 14:43:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF999160B3A; Wed, 18 Jan 2017 13:43:24 +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 D8BE4160B5C for ; Wed, 18 Jan 2017 14:43:23 +0100 (CET) Received: (qmail 9431 invoked by uid 500); 18 Jan 2017 13:43:23 -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 7428 invoked by uid 99); 18 Jan 2017 13:43:18 -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; Wed, 18 Jan 2017 13:43:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0DA4DFD7D; Wed, 18 Jan 2017 13:43:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 18 Jan 2017 13:43:43 -0000 Message-Id: <1fc990c2e2714f7a91f9619b59e71713@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 archived-at: Wed, 18 Jan 2017 13:43:24 -0000 Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c31bc1a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c31bc1a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c31bc1a Branch: refs/heads/ignite-gg-11810-2 Commit: 6c31bc1a59b56de5328af3d9c160e35dd7e52c34 Parents: 8f69186 6e5bfea Author: Alexey Goncharuk Authored: Mon Jan 16 21:10:08 2017 +0300 Committer: Alexey Goncharuk Committed: Mon Jan 16 21:10:08 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../cache/DynamicCacheChangeRequest.java | 8 +++--- .../processors/cache/GridCacheProcessor.java | 9 ++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 1 - .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +++++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 ++++++++ .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++++++++++++-------- .../query/h2/opt/GridH2TableSelfTest.java | 8 +++++- 11 files changed, 56 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java ----------------------------------------------------------------------