Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b14aafb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b14aafb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b14aafb4 Branch: refs/heads/ignite-185 Commit: b14aafb4e1dc6a4b1dff54f1b7056de119c992a3 Parents: 0eec7d4 f438806 Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 19 17:05:12 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 19 17:05:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/future/GridFutureAdapter.java | 8 +++++--- .../ignite/internal/util/future/GridFutureAdapterEx.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
