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 5A54A111B1 for ; Sat, 14 Jun 2014 04:55:06 +0000 (UTC) Received: (qmail 51894 invoked by uid 500); 14 Jun 2014 04:55:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 51816 invoked by uid 500); 14 Jun 2014 04:55:06 -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 51260 invoked by uid 99); 14 Jun 2014 04:55:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 04:55:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9E7E0934935; Sat, 14 Jun 2014 04:55:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 14 Jun 2014 04:55:42 -0000 Message-Id: <6263391bc95d4b48953ec6dd118f53fc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/51] [abbrv] git commit: Merge remote-tracking branch 'origin/master' into ACCUMULO-378 Merge remote-tracking branch 'origin/master' into ACCUMULO-378 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97044d74 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97044d74 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97044d74 Branch: refs/heads/master Commit: 97044d749890e8d08d015ef121c1a4b04f396735 Parents: 949eebb 809b73c Author: Josh Elser Authored: Fri Jun 6 11:32:29 2014 -0400 Committer: Josh Elser Committed: Fri Jun 6 11:32:29 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------