Author: ecn
Date: Thu Mar 22 20:21:03 2012
New Revision: 1304027
URL: http://svn.apache.org/viewvc?rev=1304027&view=rev
Log:
ACCUMULO-145 merge to 1.4 branch
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/pom.xml
incubator/accumulo/branches/1.4/src/assemble/dist.xml
incubator/accumulo/branches/1.4/src/core/ (props changed)
incubator/accumulo/branches/1.4/src/server/ (props changed)
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4.0rc:r1304025
Modified: incubator/accumulo/branches/1.4/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/pom.xml?rev=1304027&r1=1304026&r2=1304027&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/pom.xml (original)
+++ incubator/accumulo/branches/1.4/pom.xml Thu Mar 22 20:21:03 2012
@@ -345,14 +345,6 @@
</mapper>
</data>
<data>
- <src>DISCLAIMER</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/accumulo</prefix>
- </mapper>
- </data>
- <data>
<src>NOTICE</src>
<type>file</type>
<mapper>
Modified: incubator/accumulo/branches/1.4/src/assemble/dist.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/assemble/dist.xml?rev=1304027&r1=1304026&r2=1304027&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/assemble/dist.xml (original)
+++ incubator/accumulo/branches/1.4/src/assemble/dist.xml Thu Mar 22 20:21:03
2012
@@ -69,7 +69,6 @@
<fileSet>
<includes>
<include>CHANGES</include>
- <include>DISCLAIMER</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>README</include>
Propchange: incubator/accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4.0rc/src/core:r1304025
Propchange: incubator/accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4.0rc/src/server:r1304025
