Return-Path: 
 <commits-return-15765-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 167FA18B77
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 28 May 2015 18:18:07 +0000 (UTC)
Received: (qmail 14182 invoked by uid 500); 28 May 2015 18:18:06 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 14087 invoked by uid 500); 28 May 2015 18:18:06 -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 13943 invoked by uid 99); 28 May 2015 18:18:06 -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; Thu, 28 May 2015 18:18:06 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 94430E10F4; Thu, 28 May 2015 18:18:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ctubbsii@apache.org
To: commits@accumulo.apache.org
Date: Thu, 28 May 2015 18:18:10 -0000
Message-Id: <6df34564f8e042499139aad197a89904@git.apache.org>
In-Reply-To: <cfbfb289fcac4d89be7089451960379c@git.apache.org>
References: <cfbfb289fcac4d89be7089451960379c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7fcc2f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7fcc2f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7fcc2f6

Branch: refs/heads/1.7
Commit: b7fcc2f66f35b435764d8f35c737cdfb2db623fb
Parents: 244eeb6 f974f6d
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu May 28 14:15:08 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu May 28 14:15:08 2015 -0400

----------------------------------------------------------------------
 proxy/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7fcc2f6/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index ee106c7,b75935a..75961b0
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -82,13 -90,13 +82,13 @@@
        <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-log4j12</artifactId>
 -      <groupId>org.apache.zookeeper</groupId>
 -      <artifactId>zookeeper</artifactId>
++      <groupId>org.easymock</groupId>
++      <artifactId>easymock</artifactId>
        <scope>test</scope>
      </dependency>
      <dependency>
--      <groupId>org.easymock</groupId>
--      <artifactId>easymock</artifactId>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-log4j12</artifactId>
        <scope>test</scope>
      </dependency>
    </dependencies>