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-1093 Commit: 00b27cecb917edf61573cf2989e268636d9fb312 Parents: e567f8c 58f9fe4 Author: sboikov <[email protected]> Authored: Thu Aug 27 12:44:38 2015 +0300 Committer: sboikov <[email protected]> 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(-) ----------------------------------------------------------------------
