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/06/04 13:46:15 UTC

[7/8] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into nodejs

Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into nodejs


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

Branch: refs/heads/nodejs
Commit: b7d61b5519e6c67a5c9627390a7ab6d7964c2713
Parents: 2902977 7501025
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jun 4 11:07:41 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jun 4 11:07:41 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |   3 +
 .../processors/cache/GridCacheContext.java      |   3 -
 .../dht/GridDhtPartitionTopologyImpl.java       |   8 +-
 .../GridDhtPartitionsExchangeFuture.java        |  10 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   3 +
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  31 -----
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |  56 +++++++-
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      |  10 +-
 .../TcpDiscoveryMulticastIpFinder.java          |  47 +++++--
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  62 +++++++++
 .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +++++++++++++++++++
 .../IgniteSpiDiscoverySelfTestSuite.java        |   1 +
 .../gce/TcpDiscoveryGoogleStorageIpFinder.java  |  43 ++++---
 13 files changed, 324 insertions(+), 82 deletions(-)
----------------------------------------------------------------------