Merge branches 'ignite-752' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49a99233 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49a99233 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49a99233 Branch: refs/heads/ignite-844 Commit: 49a992339a34e28b29dbbd84aa5dede1614eebb5 Parents: 7121619 e0648d6 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Apr 30 17:22:06 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Apr 30 17:22:06 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ---- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ---- .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++++---- .../ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java | 8 ++++++++ 4 files changed, 12 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
