Merge branches 'ignite-32' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a577f744 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a577f744 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a577f744 Branch: refs/heads/sprint-1 Commit: a577f744c59f7d0cf2693800bec86a900e9a306b Parents: 616e48c cbdbb8e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Feb 5 13:19:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Feb 5 13:19:21 2015 +0700 ---------------------------------------------------------------------- .../ignite/cache/GridCacheVersionedEntry.java | 3 +-- .../internal/util/future/IgniteFutureImpl.java | 9 ++++----- .../java/org/apache/ignite/lang/IgniteFuture.java | 18 ++++++++---------- .../util/future/IgniteFutureImplTest.java | 3 ++- .../processors/schedule/ScheduleFutureImpl.java | 16 ++++++++-------- 5 files changed, 23 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
