Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615-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/9e5fc85a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e5fc85a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e5fc85a Branch: refs/heads/ignite-gg-9615-1 Commit: 9e5fc85ac20151c30e9bb4a69600aa2de09e4c14 Parents: 0a5f5e3 e18147d Author: ptupitsyn <ptupit...@gridgain.com> Authored: Wed Aug 19 17:30:21 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Wed Aug 19 17:30:21 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
