Merge branches 'ignite-484-1' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7229dcb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7229dcb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7229dcb Branch: refs/heads/ignite-1026 Commit: a7229dcba352f9b0c3ddb2432bb5beb7d9bfca50 Parents: 4aee1e2 4375529 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Jun 12 00:16:51 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Jun 12 00:16:51 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 38 +------ .../tcp/TcpClientDiscoverySpiSelfTest.java | 114 ++++++++++++++++++- 2 files changed, 115 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
