You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2013/12/28 01:05:29 UTC
[17/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bea6e941
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bea6e941
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bea6e941
Branch: refs/heads/master
Commit: bea6e94176188f9c14daacf9c5b7cc1678da39cb
Parents: 4aa48e1 17f4de1
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Dec 27 16:04:02 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Dec 27 16:04:02 2013 -0800
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bea6e941/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2681508,4d223d9..3aa1892
--- a/pom.xml
+++ b/pom.xml
@@@ -136,9 -126,14 +136,14 @@@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <version>1.30</version>
+ <version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>