Merge branch 'ignite-timeout' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15d55b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15d55b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15d55b1a Branch: refs/heads/ignite-843 Commit: 15d55b1a5fcaee7c91f450426bc537f3dffd77cf Parents: 36805cc df25d35 Author: nikolay tikhonov <ntikho...@gridgain.com> Authored: Mon May 18 14:49:20 2015 +0300 Committer: nikolay tikhonov <ntikho...@gridgain.com> Committed: Mon May 18 14:49:20 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
