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 AEF77200C7F for ; Tue, 18 Apr 2017 12:37:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ADC4D160BB3; Tue, 18 Apr 2017 10:37:01 +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 93316160BA1 for ; Tue, 18 Apr 2017 12:37:00 +0200 (CEST) Received: (qmail 37550 invoked by uid 500); 18 Apr 2017 10:36:59 -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 36575 invoked by uid 99); 18 Apr 2017 10:36:58 -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; Tue, 18 Apr 2017 10:36:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9681AE1863; Tue, 18 Apr 2017 10:36:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Tue, 18 Apr 2017 10:37:39 -0000 Message-Id: <9703a0afd1d2449d979644379a32d973@git.apache.org> In-Reply-To: <7dad08e746db42b19cf05793ff096d1a@git.apache.org> References: <7dad08e746db42b19cf05793ff096d1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/50] [abbrv] ignite git commit: Merge branch 'ignite-1.8.5-p1' archived-at: Tue, 18 Apr 2017 10:37:01 -0000 Merge branch 'ignite-1.8.5-p1' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d0b83d8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d0b83d8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d0b83d8 Branch: refs/heads/ignite-4986 Commit: 3d0b83d8dc37faf3f2f7963a9e1cf7380e11150a Parents: 227599f cd0b929 Author: dkarachentsev Authored: Tue Apr 18 12:53:05 2017 +0300 Committer: dkarachentsev Committed: Tue Apr 18 12:53:05 2017 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 3 ++ .../IgniteCacheExpiryPolicyAbstractTest.java | 44 ++++++++++++++++++++ 2 files changed, 47 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3d0b83d8/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3d0b83d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ----------------------------------------------------------------------