Merge branch 'ignite-timeout' 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/478cc7bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/478cc7bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/478cc7bf Branch: refs/heads/ignite-866 Commit: 478cc7bfe8a507982ac0ad9fd7d3370d19a936fa Parents: b95d2ae de1c80e Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue May 12 17:46:50 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue May 12 17:46:50 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
