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/46b36e8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b36e8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b36e8f Branch: refs/heads/ignite-709_3 Commit: 46b36e8fd728edb71aee578bbace93b746888bf5 Parents: ce5eb8b aaa7425 Author: sboikov <semen.boi...@inria.fr> Authored: Fri May 15 20:50:29 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Fri May 15 20:50:29 2015 +0300 ---------------------------------------------------------------------- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 28 --------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 +++++++++ .../continuous/GridEventConsumeSelfTest.java | 63 ++++++++++++-------- .../testframework/junits/GridAbstractTest.java | 16 +++++ 5 files changed, 82 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
