You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/14 13:58:52 UTC

[4/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3

Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ede1d0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ede1d0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ede1d0a

Branch: refs/heads/ignite-709_3
Commit: 1ede1d0ad9dfb707d3986d34aa4e2b188ece7129
Parents: 22ec4aa cb762a4
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 14 14:42:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 14 14:42:57 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java          | 2 +-
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java    | 3 +++
 .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 5 -----
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ede1d0a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------