accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1484205 - in /accumulo/trunk: ./ assemble/ assemble/src/main/assemblies/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
Date Sun, 19 May 2013 01:14:42 GMT
Author: ctubbsii
Date: Sun May 19 01:14:42 2013
New Revision: 1484205

URL: http://svn.apache.org/r1484205
Log:
ACCUMULO-1404,ACCUMULO-1423 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1484171-1484204

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1484171-1484204

Modified: accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/binary-release.xml?rev=1484205&r1=1484204&r2=1484205&view=diff
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original)
+++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Sun May 19 01:14:42 2013
@@ -24,8 +24,8 @@
   <fileSets>
     <fileSet>
       <directory>../bin</directory>
-      <fileMode>0755</fileMode>
       <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
     </fileSet>
     <fileSet>
       <directory>../lib</directory>
@@ -47,11 +47,22 @@
     <fileSet>
       <directory>../lib/native</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
       <includes>
         <include>**/*.so</include>
+        <include>**/*.jnilib</include>
       </includes>
     </fileSet>
     <fileSet>
+      <directory>../server/src/main/c++</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.jnilib</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
       <directory>../lib/ext</directory>
       <outputDirectory>/lib/ext</outputDirectory>
       <directoryMode>0755</directoryMode>
@@ -70,6 +81,7 @@
     <fileSet>
       <directory>../docs</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
       <excludes>
         <exclude>src/**</exclude>
       </excludes>
@@ -77,7 +89,7 @@
     <fileSet>
       <directory>../conf</directory>
       <directoryMode>0755</directoryMode>
-      <fileMode>755</fileMode>
+      <fileMode>0755</fileMode>
       <includes>
         <include>examples/**/*.sh</include>
       </includes>
@@ -85,6 +97,7 @@
     <fileSet>
       <directory>../conf</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
       <includes>
         <include>accumulo.policy.example</include>
         <include>examples/**</include>
@@ -111,6 +124,7 @@
     <fileSet>
       <directory>../test</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
       <excludes>
         <exclude>**/.*/**</exclude>
         <exclude>pom.xml</exclude>
@@ -152,7 +166,20 @@
     <fileSet>
       <directory>../proxy/examples</directory>
       <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+      <includes>
+        <include>**/*.py</include>
+        <include>**/*.rb</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy/examples</directory>
+      <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.rb</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>../proxy/src/main/thrift</directory>
@@ -163,6 +190,11 @@
         <include>*.thrift</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>scripts</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+    </fileSet>
   </fileSets>
   <files>
     <file>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1484171-1484204

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1484171-1484204

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1484171-1484204

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1484171-1484204

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1484171-1484204

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/proxy/README:r1484171-1484204

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1484171-1484204

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1484171-1484204



Mime
View raw message