accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Mon, 08 Sep 2014 22:26:42 GMT
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
----------------------------------------------------------------------


Mime
View raw message