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 CCF8C18678 for ; Thu, 22 Oct 2015 09:48:33 +0000 (UTC) Received: (qmail 9128 invoked by uid 500); 22 Oct 2015 09:48:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9041 invoked by uid 500); 22 Oct 2015 09:48:33 -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 8877 invoked by uid 99); 22 Oct 2015 09:48:33 -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, 22 Oct 2015 09:48:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 743D6E10C6; Thu, 22 Oct 2015 09:48:33 +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: Thu, 22 Oct 2015 09:48:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2 Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe401b5e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe401b5e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe401b5e Branch: refs/heads/ignite-1093-2 Commit: fe401b5e15bbae8dd59dc78f8ea8f079f5763042 Parents: a21b50a 0acb5db Author: Anton Vinogradov Authored: Wed Oct 21 14:56:15 2015 +0300 Committer: Anton Vinogradov Committed: Wed Oct 21 14:56:15 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++--- .../processors/cache/CacheAffinityCallSelfTest.java | 4 +++- .../replicated/GridReplicatedTxPreloadTest.java | 7 ++++++- 3 files changed, 16 insertions(+), 5 deletions(-) ----------------------------------------------------------------------