Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bccba308 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bccba308 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bccba308 Branch: refs/heads/ignite-950 Commit: bccba308a884ef527cf7f84f7f6dd57d55b1e51a Parents: aea804b e0c53b8 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jul 1 11:13:36 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jul 1 11:13:36 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
