Merge branches 'ignite-45' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95d690b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95d690b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95d690b9 Branch: refs/heads/ignite-45 Commit: 95d690b911bb6470c7eeb4432f78450919ee38b0 Parents: ef5c2f2 e1c6290 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Mar 20 19:57:39 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Mar 20 19:57:39 2015 -0700 ---------------------------------------------------------------------- .../internal/util/future/IgniteFutureImpl.java | 5 ---- .../org/apache/ignite/lang/IgniteFuture.java | 31 ++++++++++++++++---- .../processors/schedule/ScheduleFutureImpl.java | 11 ------- 3 files changed, 25 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
