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 2014/03/04 14:37:20 UTC
[1/6] git commit: [maven-release-plugin] prepare release 1.5.1
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 18a55009e -> e0571816a
[maven-release-plugin] prepare release 1.5.1
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3478f71a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3478f71a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3478f71a
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3478f71ae888f8d73aaa93837319a6dbb4ba0c8a
Parents: 3145cce
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 24 13:13:25 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 24 13:13:25 2014 -0500
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
examples/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 4 ++--
proxy/pom.xml | 2 +-
server/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 40b77cc..21a31c8 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d02a3cd..538ec4a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-core</artifactId>
<name>Core</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index ec39e30..56d4311 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-examples</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index d513e68..7ca5ed3 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-examples-simple</artifactId>
<name>Simple Examples</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 30c4973..b023acd 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Fate</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 32848d8..877d375 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>MiniCluster</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ae58ed..d9d53ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
<packaging>pom</packaging>
<name>Apache Accumulo Project</name>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
@@ -86,7 +86,7 @@
<scm>
<connection>scm:git:git://git.apache.org/accumulo.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
- <tag>${project.version}</tag>
+ <tag>1.5.1</tag>
<url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 1b2bfa2..626c611 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 52b2f1e..b800c09 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-server</artifactId>
<name>Server</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 5c2c09b..e61fedd 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-start</artifactId>
<name>Start</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 9579581..69c0a72 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-test</artifactId>
<name>Testing</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3478f71a/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index 650ec1a..de32df7 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.1</version>
</parent>
<artifactId>accumulo-trace</artifactId>
<name>Trace</name>
[5/6] git commit: Merge tag '1.5.1' into 1.5.2-SNAPSHOT
Posted by md...@apache.org.
Merge tag '1.5.1' into 1.5.2-SNAPSHOT
Signing 1.5.1 release
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bee78fa6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bee78fa6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bee78fa6
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: bee78fa69f03cf1910d3b227e474d6b486f3c0a9
Parents: d095b21 3478f71
Author: John Vines <vi...@apache.org>
Authored: Mon Mar 3 14:39:17 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Mar 3 14:39:17 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] git commit: ACCUMULO-2170 updating snapshot to 1.5.2-SNAPSHOT
Posted by md...@apache.org.
ACCUMULO-2170 updating snapshot to 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d095b21f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d095b21f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d095b21f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d095b21f965b8f45f6df45ceb7deb0b0beaac8e8
Parents: a3c2f61
Author: John Vines <vi...@apache.org>
Authored: Mon Mar 3 14:36:32 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Mar 3 14:36:32 2014 -0500
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
examples/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 2 +-
proxy/pom.xml | 2 +-
server/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 40b77cc..6a20967 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d02a3cd..6e3d917 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-core</artifactId>
<name>Core</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index ec39e30..fef685d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-examples</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index d513e68..2b6ab69 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-examples-simple</artifactId>
<name>Simple Examples</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 30c4973..433e61a 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Fate</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 32848d8..9d2b7cb 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>MiniCluster</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ae58ed..9fd5bfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Accumulo Project</name>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 1b2bfa2..9661104 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 52b2f1e..667b864 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-server</artifactId>
<name>Server</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 5c2c09b..5fc9346 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-start</artifactId>
<name>Start</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 9579581..bf0a3f8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-test</artifactId>
<name>Testing</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d095b21f/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index 650ec1a..8e7b083 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>accumulo-trace</artifactId>
<name>Trace</name>
[2/6] git commit: ACCUMULO-2281 copy dependencies to correct dir
Posted by md...@apache.org.
ACCUMULO-2281 copy dependencies to correct dir
Use project.parent.basedir instead of relative paths for copying
dependencies for packaging and assembly.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8bbb916
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8bbb916
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8bbb916
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a8bbb916c2796d7f2bbc64ef82291034bbb3810d
Parents: 57b2e5c
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 3 12:05:55 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 3 12:05:55 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
src/examples/simple/pom.xml | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8bbb916/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92d8106..4c8e5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>../../lib</outputDirectory>
+ <outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8bbb916/src/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/simple/pom.xml b/src/examples/simple/pom.xml
index 6ef7741..44f6b88 100644
--- a/src/examples/simple/pom.xml
+++ b/src/examples/simple/pom.xml
@@ -124,6 +124,22 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.parent.basedir}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<outputDirectory>../../../lib</outputDirectory>
[3/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3c2f61f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3c2f61f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3c2f61f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a3c2f61f450f21f37c7d71f17d3ff020efc1e823
Parents: 7eeff02 a8bbb91
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 3 12:09:28 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 3 12:09:28 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] git commit: Merge branch 1.5.2-SNAPSHOT into 1.6.0-SNAPSHOT
Posted by md...@apache.org.
Merge branch 1.5.2-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/e0571816
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0571816
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0571816
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e0571816af3bae8d3423d6020046d617cb6e6782
Parents: 18a5500 bee78fa
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 08:33:04 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 08:33:04 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------