Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61bb1b47 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61bb1b47 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61bb1b47 Branch: refs/heads/master Commit: 61bb1b47df3639f3fff59a4e591986282078cbc8 Parents: e76d89a 28be43e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 17 18:16:08 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 17 18:16:08 2015 -0400 ---------------------------------------------------------------------- CHANGES | 1776 ----------------------- assemble/src/main/assemblies/component.xml | 1 - 2 files changed, 1777 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/61bb1b47/assemble/src/main/assemblies/component.xml ---------------------------------------------------------------------- diff --cc assemble/src/main/assemblies/component.xml index 463bcf6,bf2d4e2..644f1a9 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@@ -248,20 -244,9 +248,19 @@@ <directory>../</directory> <fileMode>0644</fileMode> <includes> - <include>CHANGES</include> <include>LICENSE</include> <include>NOTICE</include> - <include>README</include> + <include>README.md</include> + <include>INSTALL.md</include> + <include>BUILD.md</include> + </includes> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>lib</outputDirectory> + <fileMode>0644</fileMode> + <includes> + <include>VERSIONS</include> </includes> </fileSet> </fileSets>
