Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d6754f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d6754f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d6754f8 Branch: refs/heads/ignite-836_2 Commit: 2d6754f8358fa96311fdc5fefa5aa0a38ecfc265 Parents: 490827e 7625bdc Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu May 7 16:25:58 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu May 7 16:25:58 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpClientDiscoverySpi.java | 13 +++++++++++++ .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d6754f8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d6754f8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
