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/ce5eb8bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce5eb8bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce5eb8bd

Branch: refs/heads/ignite-709_3
Commit: ce5eb8bd2da97cb071eb0f7743d2224dd2c03ed3
Parents: ac72c09 fd94eab
Author: sboikov <semen.boi...@inria.fr>
Authored: Fri May 15 19:26:27 2015 +0300
Committer: sboikov <semen.boi...@inria.fr>
Committed: Fri May 15 19:26:27 2015 +0300

----------------------------------------------------------------------
 .../discovery/tcp/TcpClientDiscoverySpi.java    | 20 ++++-----
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 11 ++++-
 .../TcpDiscoveryNodeAddFinishedMessage.java     | 43 ++++++++++++++++++++
 ...acheTcpClientDiscoveryMultiThreadedTest.java |  2 +-
 .../continuous/GridEventConsumeSelfTest.java    |  4 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      | 38 ++++++++++++++---
 6 files changed, 99 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


Reply via email to