Merge branch '1.5.1-SNAPSHOT'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d54a4fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d54a4fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d54a4fa
Branch: refs/heads/master
Commit: 2d54a4faf557476ed1d5dd8bc96c03a2b0149b27
Parents: 7569b3d f75be7d
Author: Christopher Tubbs <[email protected]>
Authored: Thu Sep 5 20:47:56 2013 -0400
Committer: Christopher Tubbs <[email protected]>
Committed: Thu Sep 5 20:47:56 2013 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d54a4fa/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c03ee25,9ec893c..9d6ba50
--- a/pom.xml
+++ b/pom.xml
@@@ -501,7 -479,12 +501,7 @@@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
- <configuration>
- <excludes>
- <exclude>docs/apidocs/package-list</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
