Merge remote-tracking branch 'remotes/origin/ignite-579' 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/571273ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/571273ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/571273ed Branch: refs/heads/ignite-437-sqltests Commit: 571273edebe5d39e49c80420c99d7c73f3f80328 Parents: 0e8edd1 198a00e Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 10:15:24 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 10:15:24 2015 +0300 ---------------------------------------------------------------------- .../GridFutureRemapTimeoutObject.java | 73 ++++++++++++++++++++ .../dht/GridPartitionedGetFuture.java | 26 +++++-- .../distributed/near/GridNearGetFuture.java | 71 ++++--------------- 3 files changed, 108 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/571273ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ----------------------------------------------------------------------
