accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [07/10] accumulo git commit: Merge branch '1.5' into 1.6
Date Thu, 28 May 2015 18:18:12 GMT
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/master
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>


Mime
View raw message