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/a2b7ba1b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a2b7ba1b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a2b7ba1b Branch: refs/heads/ignite-1093 Commit: a2b7ba1bb70ca67d09479b9a4ca1ab4d87cced08 Parents: cfc4d66 6b2ee50 Author: nikolay_tikhonov <[email protected]> Authored: Thu Aug 27 12:12:54 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Thu Aug 27 12:12:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteInternalFuture.java | 10 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 23 +++++++- .../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 +++++++++++++------- .../testframework/junits/GridAbstractTest.java | 2 +- 8 files changed, 153 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
