Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c67bdf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c67bdf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c67bdf2 Branch: refs/heads/ignite-51 Commit: 6c67bdf27f962aee64414c90965e8a86a1cc907d Parents: 6deba53 c9f46c1 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Mar 2 11:45:01 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Mar 2 11:45:01 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(-) ----------------------------------------------------------------------
