Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/900e4b82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/900e4b82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/900e4b82 Branch: refs/heads/ignite-843 Commit: 900e4b824f8cc530f7df99f6e7e7bf132fef8d17 Parents: 8a43348 e18147d Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Thu Aug 20 09:52:56 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Thu Aug 20 09:52:56 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
