Merge remote-tracking branch 'remotes/origin/ignite-11' into sprint-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/c9f46c1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9f46c1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9f46c1b Branch: refs/heads/ignite-141 Commit: c9f46c1b39577c82d1084f13ffedb965a8e2c83c Parents: 036bd71 6130f7e Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun Mar 1 22:59:09 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun Mar 1 22:59:09 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/IgniteUtils.java | 90 ++++++++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++-------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++ 3 files changed, 275 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
