Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECFE610CD6 for ; Thu, 5 Jun 2014 22:12:15 +0000 (UTC) Received: (qmail 63533 invoked by uid 500); 5 Jun 2014 22:12:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63429 invoked by uid 500); 5 Jun 2014 22:12:15 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 63347 invoked by uid 99); 5 Jun 2014 22:12:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2014 22:12:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 972CC94CEF8; Thu, 5 Jun 2014 22:12:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Thu, 05 Jun 2014 22:12:19 -0000 Message-Id: <490dbc0f12194fa9bb720e7a37dfece2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d6ca1b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d6ca1b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d6ca1b Branch: refs/heads/1.6.1-SNAPSHOT Commit: 18d6ca1bf79793443366c04e54285214a69eb422 Parents: c202598 affb974 Author: Mike Drob Authored: Thu Jun 5 15:12:08 2014 -0700 Committer: Mike Drob Committed: Thu Jun 5 15:12:08 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d6ca1b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ----------------------------------------------------------------------