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 B111C18A8C for ; Tue, 19 Jan 2016 10:58:53 +0000 (UTC) Received: (qmail 90997 invoked by uid 500); 19 Jan 2016 10:58:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 90908 invoked by uid 500); 19 Jan 2016 10:58:53 -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 90134 invoked by uid 99); 19 Jan 2016 10:58:53 -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, 19 Jan 2016 10:58:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1EF55E0A12; Tue, 19 Jan 2016 10:58:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Tue, 19 Jan 2016 10:59:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/38] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d85616b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d85616b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d85616b9 Branch: refs/heads/ignite-gg-10837 Commit: d85616b9bd788d0192272a13df18f9319f14a836 Parents: f6dcc63 1301646 Author: Yakov Zhdanov Authored: Mon Jan 18 17:58:48 2016 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 18 17:58:48 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsProcessor.java | 3 --- ...CommunicationRecoveryAckClosureSelfTest.java | 2 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 20 +++++--------------- .../Common/IgniteFutureCancelledException.cs | 1 + 4 files changed, 8 insertions(+), 18 deletions(-) ----------------------------------------------------------------------