accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1407492 - in /accumulo/branches/1.4.2: ./ src/ src/assemble/dist.xml src/core/ src/server/
Date Fri, 09 Nov 2012 15:27:34 GMT
Author: afuchs
Date: Fri Nov  9 15:27:33 2012
New Revision: 1407492

URL: http://svn.apache.org/viewvc?rev=1407492&view=rev
Log:
ACCUMULO-364 merged to 1.4.2

Modified:
    accumulo/branches/1.4.2/   (props changed)
    accumulo/branches/1.4.2/src/   (props changed)
    accumulo/branches/1.4.2/src/assemble/dist.xml
    accumulo/branches/1.4.2/src/core/   (props changed)
    accumulo/branches/1.4.2/src/server/   (props changed)

Propchange: accumulo/branches/1.4.2/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1407301

Propchange: accumulo/branches/1.4.2/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1407301

Modified: accumulo/branches/1.4.2/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.2/src/assemble/dist.xml?rev=1407492&r1=1407491&r2=1407492&view=diff
==============================================================================
--- accumulo/branches/1.4.2/src/assemble/dist.xml (original)
+++ accumulo/branches/1.4.2/src/assemble/dist.xml Fri Nov  9 15:27:33 2012
@@ -40,6 +40,7 @@
     <fileSet>
       <includes>
         <include>conf/examples/**</include>
+        <include>conf/*.example</include>
         <include>conf/*_logger.xml</include>
         <include>conf/log4j.properties</include>
         <include>**/*.py</include>

Propchange: accumulo/branches/1.4.2/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1407301

Propchange: accumulo/branches/1.4.2/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server:r1407301



Mime
View raw message