Merge pull request #64 from apenney/100-release

Free volcane@ by giving him a sock.

CHANGELOG

@@ -1,3 +1,29 @@
+2013-08-09 1.0.0
+
+Summary:
+
+Many new features and bugfixes in this release, and if you're a heavy concat
+user you should test carefully before upgrading.  The features should all be
+backwards compatible but only light testing has been done from our side before
+this release.
+
+Features:
+- New parameters in concat:
+ - `replace`: specify if concat should replace existing files.
+ - `ensure_newline`: controls if fragments should contain a newline at the end.
+- Improved README documentation.
+- Add rspec:system tests (rake spec:system to test concat)
+
+Bugfixes
+- Gracefully handle \n in a fragment resource name.
+- Adding more helpful message for 'pluginsync = true'
+- Allow passing `source` and `content` directly to file resource, rather than
+defining resource defaults.
+- Added -r flag to read so that filenames with \ will be read correctly.
+- sort always uses LANG=C.
+- Allow WARNMSG to contain/start with '#'.
+- Replace while-read pattern with for-do in order to support Solaris.
+
 CHANGELOG:
 - 2010/02/19 - initial release
 - 2010/03/12 - add support for 0.24.8 and newer

Modulefile

@@ -1,8 +1,8 @@
-name 'ripienaar-concat'
+name 'puppetlabs-concat'
-version '0.2.0'
+version '1.0.0-rc1'
-source 'git://github.com/ripienaar/puppet-concat.git'
+source 'git://github.com/puppetlabs/puppetlabs-concat.git'
-author 'R.I.Pienaar'
+author 'Puppetlabs'
-license 'Apache'
+license 'Apache 2.0'
 summary 'Concat module'
 description 'Concat module'
-project_page 'http://github.com/ripienaar/puppet-concat'
+project_page 'http://github.com/puppetlabs/puppetlabs-concat'

README

@@ -84,11 +84,8 @@ Apache Version 2
 
 === Latest:
 
-http://github.com/ripienaar/puppet-concat/
+http://github.com/puppetlabs/puppetlabs-concat/
 
 === Contact:
 
-* R.I.Pienaar <rip@devco.net>
+Puppetlabs, via our puppet-users@ mailing list.
-* Volcane on freenode
-* @ripienaar on twitter
-* www.devco.net

README.markdown

@@ -151,4 +151,4 @@ Contributors:
 
 Contact:
 --------
-R.I.Pienaar / rip@devco.net / @ripienaar / http://devco.net
+puppet-users@ mailing list.