Skip to content

Commit

Permalink
Merge pull request #320 from DavidS/add-warn-warning
Browse files Browse the repository at this point in the history
(MODULES-2080) Call out changed behaviour of 'warn' parameter
  • Loading branch information
tphoney committed May 29, 2015
2 parents f4d4ca0 + b271bff commit 773b858
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,13 @@ Specifies whether to add a header message at the top of the destination file. Va
If you set 'warn' to 'true', `concat` adds the following message:

~~~
# This file is managed by Puppet. DO NOT EDIT.
# This file is managed by Puppet. DO NOT EDIT.\n
~~~

Before 2.0.0, this parameter would add a newline at the end of the warn
message. To improve flexibilty, this was removed. Please add it explicitely if
you need it.

####Define: `concat::fragment`

Except where noted, all the below parameters are optional.
Expand Down
5 changes: 4 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
# The mode of the final file
# [*warn*]
# Adds a normal shell style comment top of the file indicating that it is
# built by puppet
# built by puppet.
# Before 2.0.0, this parameter would add a newline at the end of the warn
# message. To improve flexibilty, this was removed. Please add it explicitely
# if you need it.
# [*backup*]
# Controls the filebucketing behavior of the final file and see File type
# reference for its use. Defaults to 'puppet'
Expand Down

0 comments on commit 773b858

Please sign in to comment.