Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 36EF0200B50 for ; Mon, 20 Jun 2016 14:52:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 35E4B160A67; Mon, 20 Jun 2016 12:52:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F11B6160A6F for ; Mon, 20 Jun 2016 14:52:43 +0200 (CEST) Received: (qmail 8782 invoked by uid 500); 20 Jun 2016 12:52:43 -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 7755 invoked by uid 99); 20 Jun 2016 12:52:42 -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, 20 Jun 2016 12:52:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DE62E01BD; Mon, 20 Jun 2016 12:52:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 20 Jun 2016 12:53:25 -0000 Message-Id: <9c370e8ed16d43b095b6bceb0701770b@git.apache.org> In-Reply-To: <89985bfe12394840b4deddba739acaf2@git.apache.org> References: <89985bfe12394840b4deddba739acaf2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] ignite git commit: Merge remote-tracking branch 'upstream/gridgain-7.5.27' into gridgain-7.5.27 archived-at: Mon, 20 Jun 2016 12:52:46 -0000 Merge remote-tracking branch 'upstream/gridgain-7.5.27' into gridgain-7.5.27 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a14e471 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a14e471 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a14e471 Branch: refs/heads/ignite-3341 Commit: 8a14e471730203db008bd05192d31c11cc1ac172 Parents: 06d0e51 694aabb Author: vozerov-gridgain Authored: Fri Jun 17 16:34:14 2016 +0300 Committer: vozerov-gridgain Committed: Fri Jun 17 16:34:14 2016 +0300 ---------------------------------------------------------------------- .../zk/TcpDiscoveryZookeeperIpFinder.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------