You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2014/10/05 00:52:46 UTC

[1/3] git commit: ACCUMULO-3205 mark jceks files as binary for RAT checks.

Repository: accumulo
Updated Branches:
  refs/heads/1.6 9c4967e8f -> 42a3fec7a
  refs/heads/master c217a7d60 -> 7dea18104


ACCUMULO-3205 mark jceks files as binary for RAT checks.

jceks files are detected as binary on OS X, so rat check passes locally.
The current asf run jenkins box's ubuntu version doesn't think they're binary, so rat check fails.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42a3fec7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42a3fec7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42a3fec7

Branch: refs/heads/1.6
Commit: 42a3fec7a72041bcd53279b687242e9cd037db0e
Parents: 9c4967e
Author: Sean Busbey <bu...@cloudera.com>
Authored: Sat Oct 4 13:42:42 2014 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Sat Oct 4 13:50:23 2014 -0500

----------------------------------------------------------------------
 core/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/42a3fec7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 208f5c8..03f6be2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
+              <exclude>src/test/resources/site-cfg.jceks</exclude>
+              <exclude>src/test/resources/accumulo.jceks</exclude>
+              <exclude>src/test/resources/empty.jceks</exclude>
+              <exclude>src/test/resources/passwords.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>


[3/3] git commit: Merge branch '1.6'

Posted by bu...@apache.org.
Merge branch '1.6'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7dea1810
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7dea1810
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7dea1810

Branch: refs/heads/master
Commit: 7dea1810407a86a904e7baa9f944be1de14106d2
Parents: c217a7d 42a3fec
Author: Sean Busbey <bu...@cloudera.com>
Authored: Sat Oct 4 13:56:34 2014 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Sat Oct 4 13:56:34 2014 -0500

----------------------------------------------------------------------
 core/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7dea1810/core/pom.xml
----------------------------------------------------------------------


[2/3] git commit: ACCUMULO-3205 mark jceks files as binary for RAT checks.

Posted by bu...@apache.org.
ACCUMULO-3205 mark jceks files as binary for RAT checks.

jceks files are detected as binary on OS X, so rat check passes locally.
The current asf run jenkins box's ubuntu version doesn't think they're binary, so rat check fails.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42a3fec7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42a3fec7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42a3fec7

Branch: refs/heads/master
Commit: 42a3fec7a72041bcd53279b687242e9cd037db0e
Parents: 9c4967e
Author: Sean Busbey <bu...@cloudera.com>
Authored: Sat Oct 4 13:42:42 2014 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Sat Oct 4 13:50:23 2014 -0500

----------------------------------------------------------------------
 core/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/42a3fec7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 208f5c8..03f6be2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
               <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
+              <exclude>src/test/resources/site-cfg.jceks</exclude>
+              <exclude>src/test/resources/accumulo.jceks</exclude>
+              <exclude>src/test/resources/empty.jceks</exclude>
+              <exclude>src/test/resources/passwords.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>