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 5ED3910859 for ; Thu, 27 Aug 2015 12:19:38 +0000 (UTC) Received: (qmail 71388 invoked by uid 500); 27 Aug 2015 12:19:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71314 invoked by uid 500); 27 Aug 2015 12:19:38 -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 70914 invoked by uid 99); 27 Aug 2015 12:19:38 -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, 27 Aug 2015 12:19:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB9B3E7E5A; Thu, 27 Aug 2015 12:19:37 +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, 27 Aug 2015 12:19:51 -0000 Message-Id: <72d6049038bb46e88f181cddabf9aad5@git.apache.org> In-Reply-To: <1281c3f7ff2a4fab8129207c3cd6678e@git.apache.org> References: <1281c3f7ff2a4fab8129207c3cd6678e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/27] 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/00b27cec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00b27cec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00b27cec Branch: refs/heads/ignite-1124 Commit: 00b27cecb917edf61573cf2989e268636d9fb312 Parents: e567f8c 58f9fe4 Author: sboikov Authored: Thu Aug 27 12:44:38 2015 +0300 Committer: sboikov Committed: Thu Aug 27 12:44:38 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteInternalFuture.java | 10 +++ .../query/GridCacheQueryFutureAdapter.java | 7 ++ .../processors/igfs/IgfsMetaManager.java | 43 +++++------ .../internal/processors/igfs/IgfsUtils.java | 52 +++++++++++++ .../util/future/GridFinishedFuture.java | 5 ++ .../internal/util/future/GridFutureAdapter.java | 58 +++++++++------ .../platform/PlatformAbstractPredicate.java | 64 ++++++++++++++++ .../processors/platform/PlatformBootstrap.java | 1 - .../cluster/PlatformClusterNodeFilter.java | 77 ++++++++++++++++++++ scripts/apply-pull-request.sh | 2 + 10 files changed, 274 insertions(+), 45 deletions(-) ----------------------------------------------------------------------