Return-Path: 
 <commits-return-12760-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
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 3F7E5112FF
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Mon,  8 Sep 2014 22:26:41 +0000 (UTC)
Received: (qmail 16423 invoked by uid 500); 8 Sep 2014 22:26:41 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 16374 invoked by uid 500); 8 Sep 2014 22:26:41 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 16307 invoked by uid 99); 8 Sep 2014 22:26:41 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2014 22:26:41 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id B9C5EA0F2D5; Mon,  8 Sep 2014 22:26:40 +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: Mon, 08 Sep 2014 22:26:42 -0000
Message-Id: <984b1db065334a8599bcfe0cd0c683d9@git.apache.org>
In-Reply-To: <0861851d928d451c974524d6558cd870@git.apache.org>
References: <0861851d928d451c974524d6558cd870@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '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/c2ca6386
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c2ca6386
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c2ca6386

Branch: refs/heads/master
Commit: c2ca6386a6fc55edbefe52e2cf88a52b3175aee3
Parents: ef701ca ae01d35
Author: Josh Elser <elserj@apache.org>
Authored: Mon Sep 8 15:25:58 2014 -0700
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Sep 8 15:25:58 2014 -0700

----------------------------------------------------------------------
 pom.xml      | 2 +-
 test/pom.xml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2ca6386/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index dbfce99,98501c7..4c66132
--- a/pom.xml
+++ b/pom.xml
@@@ -156,14 -154,9 +156,14 @@@
        <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
-         <version>15.0</version>
+         <version>14.0.1</version>
        </dependency>
        <dependency>
 +        <groupId>com.google.protobuf</groupId>
 +        <artifactId>protobuf-java</artifactId>
 +        <version>2.5.0</version>
 +      </dependency>
 +      <dependency>
          <groupId>commons-cli</groupId>
          <artifactId>commons-cli</artifactId>
          <version>1.2</version>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2ca6386/test/pom.xml
----------------------------------------------------------------------