Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6551D10561 for ; Mon, 2 Mar 2015 08:40:47 +0000 (UTC) Received: (qmail 26065 invoked by uid 500); 2 Mar 2015 08:40:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26016 invoked by uid 500); 2 Mar 2015 08:40:41 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 26007 invoked by uid 99); 2 Mar 2015 08:40:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 08:40:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 08:40:38 +0000 Received: (qmail 25697 invoked by uid 99); 2 Mar 2015 08:40:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 08:40:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50778E0FC4; Mon, 2 Mar 2015 08:40:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 08:40:28 -0000 Message-Id: In-Reply-To: <9f72621504504fb8b6c3c02ee4a632ab@git.apache.org> References: <9f72621504504fb8b6c3c02ee4a632ab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/11] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b1eccf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b1eccf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b1eccf9 Branch: refs/heads/ignite-239 Commit: 0b1eccf96a260b3208c153ead6b4e314798726ad Parents: 0dfe349 c9f46c1 Author: ivasilinets Authored: Mon Mar 2 11:40:06 2015 +0300 Committer: ivasilinets Committed: Mon Mar 2 11:40:06 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(-) ----------------------------------------------------------------------