ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/20] ignite git commit: Merge remote-tracking branch 'upstream/ignite-1.6.9' into ignite-1.6.9
Date Thu, 29 Sep 2016 12:41:36 GMT
Merge remote-tracking branch 'upstream/ignite-1.6.9' into ignite-1.6.9


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

Branch: refs/heads/ignite-comm-opts2
Commit: 8127667a14184f77bc0f686d21e3062ae19260a3
Parents: 7f8281c 8ba2b94
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Sep 27 16:37:56 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Sep 27 16:37:56 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |  2 +-
 .../discovery/GridDiscoveryManager.java         | 73 ++++++++++----------
 .../util/GridBoundedConcurrentOrderedMap.java   |  5 ++
 .../TcpDiscoveryMulticastIpFinder.java          |  3 -
 .../IgniteClientReconnectCacheTest.java         | 35 ++++++++++
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  4 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  6 +-
 .../tcp/TcpClientDiscoverySpiMulticastTest.java |  2 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  2 +-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |  6 +-
 10 files changed, 90 insertions(+), 48 deletions(-)
----------------------------------------------------------------------



Mime
View raw message