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 98CD1189B1 for ; Tue, 25 Aug 2015 08:57:09 +0000 (UTC) Received: (qmail 28316 invoked by uid 500); 25 Aug 2015 08:57:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28250 invoked by uid 500); 25 Aug 2015 08:57:09 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27461 invoked by uid 99); 25 Aug 2015 08:57:09 -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; Tue, 25 Aug 2015 08:57:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E42A5E6826; Tue, 25 Aug 2015 08:57:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 25 Aug 2015 08:57:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebb5d4ad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebb5d4ad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebb5d4ad Branch: refs/heads/ignite-1093 Commit: ebb5d4ad963371749a4ca20cf4b994af6769d659 Parents: 39509b5 dd204de Author: vozerov-gridgain Authored: Fri Aug 21 11:05:25 2015 +0300 Committer: vozerov-gridgain Committed: Fri Aug 21 11:05:25 2015 +0300 ---------------------------------------------------------------------- .../TcpDiscoveryMulticastIpFinder.java | 38 ++ modules/zookeeper/pom.xml | 89 +++++ .../zk/TcpDiscoveryZookeeperIpFinder.java | 350 +++++++++++++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 +++++++++++++++++++ pom.xml | 1 + 5 files changed, 868 insertions(+) ----------------------------------------------------------------------