You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/04/30 15:19:10 UTC

[08/12] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.6-SNAPSHOT' into 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/08c255a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/08c255a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/08c255a2

Branch: refs/heads/master
Commit: 08c255a26fa93f24c4b1d36203152b54a13f4396
Parents: 89c1b73 5bd4465
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Apr 30 09:17:47 2014 -0400
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Apr 30 09:17:47 2014 -0400

----------------------------------------------------------------------
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/08c255a2/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9aeb7ee,470f742..5f1d20f
--- a/pom.xml
+++ b/pom.xml
@@@ -783,8 -443,11 +783,11 @@@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-pmd-plugin</artifactId>
 -        <version>2.4</version>
 +        <version>3.0.1</version>
          <configuration>
+           <excludes>
+             <exclude>**/thrift/*.java</exclude>
+           </excludes>
            <format>html</format>
            <includeTests>true</includeTests>
            <targetJdk>1.6</targetJdk>