opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
298 commits 2 branches 0 tags 394 KiB
Commit graph

298 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hunter Haugen
7232b8f684 Merge pull request #219 from mhaskel/1.1.1-prep 
1.1.1 prep
 2014-09-08 13:55:03 -07:00
Morgan Haskel
77d6502a2d 1.1.1 prep 2014-09-08 16:48:08 -04:00
Hunter Haugen
8c7fe1b076 Merge pull request #217 from mhaskel/more_test_failures 
Missed two stderr checks
 2014-09-08 13:11:31 -07:00
Morgan Haskel
166189dc25 Missed two stderr checks 2014-09-08 16:03:22 -04:00
Hunter Haugen
49d61fe97b Merge pull request #216 from mhaskel/test_fixes 
Stop checking for empty stderr
 2014-09-08 12:02:34 -07:00
Morgan Haskel
0acefbb79d Stop checking for empty stderr 2014-09-08 15:01:30 -04:00
Hunter Haugen
820bc092f4 Merge pull request #215 from mhaskel/idempotency 
Lack of idempotency with `ensure => 'absent'`
 2014-09-08 11:27:26 -07:00
Morgan Haskel
e015a1fdf7 Lack of idempotency with ensure => 'absent' 
Need to add an unless to the exec in the case we have `ensure =>
'absent'` for the concat, otherwise the exec (of true) runs every time.
 2014-09-08 14:24:29 -04:00
Joshua Hoblitt
15e4bc7ba6 Merge pull request #214 from PierreR/patch-1 
Update README.md
 2014-09-08 09:47:46 -07:00
Pi3r
d56febe324 Update README.md 
Unless I misread the [code] (https://github.com/puppetlabs/puppetlabs-concat/blob/master/manifests/fragment.pp#L61-L63), only 'present' or 'absent' should be used. All other options are deprecated ?
 2014-09-08 15:50:16 +02:00
Hunter Haugen
51a9fd014a Merge pull request #213 from mhaskel/stdlib4 
Remove dependency on stdlib4
 2014-09-05 13:28:03 -07:00
Morgan Haskel
3d167883dd Remove dependency on stdlib4 2014-09-05 16:26:21 -04:00
Joshua Hoblitt
ebadb90818 Merge pull request #212 from mattaezell/doc-remove-warn_message-param 
Remove documentation for reverted $warn_message parameter
 2014-09-02 12:45:50 -07:00
Matt Ezell
7e222ae8a8 Remove documentation for deprecated $warn_message parameter 
Commit 8a500af removed $warn_message.  Also remove it from the documentation
 2014-09-02 14:52:12 -04:00
Ashley Penney
42fb96e6f7 Merge pull request #211 from mhaskel/spec_updates 
Update spec_helper for consistency
 2014-08-28 17:39:54 -04:00
Morgan Haskel
52a75bc10c Update spec_helper for consistency 2014-08-28 11:26:34 -04:00
Joshua Hoblitt
feba3096c9 Merge pull request #210 from cmurphy/master 
Pin puppet-lint to 0.3.2
 2014-08-19 14:14:34 -07:00
Colleen Murphy
e464dfc771 Pin puppet-lint to 0.3.2 2014-08-19 13:45:42 -07:00
Ashley Penney
07fd96b66f Merge pull request #209 from cmurphy/master 
Remove Puppet 2.7 from travis matrix
 2014-08-19 13:56:23 -04:00
Colleen Murphy
bf1f3dedd6 Add testing on Ruby 1.8.7 with Puppet 3 to travis.yml 2014-08-19 10:51:01 -07:00
Colleen Murphy
b0a365ba37 Remove Puppet 2.7 from travis matrix 2014-08-19 10:17:45 -07:00
Joshua Hoblitt
cc1e654e60 Merge pull request #208 from flypenguin/mods 
fix: permitting $backup to be boolean false
 2014-08-18 08:41:04 -07:00
Axel Bock
b4e1c0c387 fix: permitting $backup to be a boolean value 2014-08-18 09:09:20 +02:00
Morgan Haskel
c4be91b038 Merge pull request #199 from mrgum/master 
set replace=>true on file fragments
 2014-08-01 19:35:19 -04:00
Neil Prockter
ca8e036bac ensure concat file fragments are always replaced 2014-08-02 00:18:16 +01:00
Joshua Hoblitt
07bba0bcad Merge pull request #206 from notanisp/master 
Fix errors with the future parser.
 2014-07-10 23:16:29 -07:00
Tomas Doran
8e6fe8c459 Fix errors with the future parser. 
Error: Illegal name. The given name _ensure does not conform to the naming rule \A((::)?[a-z0-9]w*)(::[a-z0-9]w*)*\z at /etc/puppet/vendor/modules/concat/manifests/fragment.pp:57:5
 2014-07-10 18:35:12 -04:00
Joshua Hoblitt
db8944a0ba Merge pull request #204 from GeoffWilliams/windows_case_fix 
fix concat broken on windows due to case sensitive regexp -- fixes MODULES-1203
 2014-07-08 20:59:25 -07:00
Geoff Williams
0ce713fd9c fix concat broken on windows due to case sensitive regexp -- made it case insensitive 2014-07-09 13:45:16 +10:00
Morgan Haskel
97f77f7459 Merge pull request #201 from chtitux/patch-1 
README.md : add missing ','
 2014-07-08 10:09:06 -04:00
Ashley Penney
a6fc85aa67 Merge pull request #203 from cmurphy/master 
Add validate and lint tasks to travis script
 2014-07-03 17:43:22 -04:00
Colleen Murphy
9c94193b3b Add validate and lint tasks to travis script 2014-07-03 09:53:38 -07:00
Hunter Haugen
c9e6ab7ed3 Merge pull request #202 from cmurphy/master 
Synchronize .travis.yml
 2014-06-30 11:03:24 -07:00
Colleen Murphy
ec789e11ad Update Gemfile for .travis.yml defaults 2014-06-30 10:57:48 -07:00
Hunter Haugen
c62dc5363a Merge pull request #197 from luisfdez/bug/quotes 
Add quotes to the ruby script location
 2014-06-27 12:44:06 -07:00
Colleen Murphy
d6a8ceeb1a Synchronize .travis.yml 2014-06-27 10:52:12 -07:00
Colleen Murphy
4b191654cb Update .sync.yml to support new .travis.yml configs 2014-06-27 09:29:18 -07:00
Morgan Haskel
bc996db7a8 Merge pull request #200 from cmurphy/master 
Start synchronizing module files
 2014-06-26 13:58:51 -04:00
Théophile Helleboid - chtitux
ad71982196 README.md : add missing ',' 
Small typo, a ',' was missing on the minimal exampel conf
 2014-06-26 10:45:35 +02:00
Colleen Murphy
2b51a83b9b Sync files 2014-06-25 17:23:15 -07:00
Colleen Murphy
551d8308c1 Add configuration file for modulesync 
https://github.com/puppetlabs/modulesync
 2014-06-25 08:19:44 -07:00
Joshua Hoblitt
56876f8ce6 Merge pull request #198 from igalic/patch-1 
small typo: missing closing '
 2014-06-21 15:44:29 -07:00
Igor Galić
222ecc020a small typo: missing losing ' 2014-06-21 14:16:47 +02:00
Luis Fernandez Alvarez
da59390ed2 Add quotes to the ruby script location 
Without this patch, if the ruby script is located in a path with
spaces, it will not work.
 2014-06-18 09:09:47 +02:00
Joshua Hoblitt
f70881fbfd Merge pull request #185 from jhoblitt/feature/fragment_order_validation 
Validate the concat::fragment order parameter as string||integer
 2014-05-29 14:38:02 -07:00
Joshua Hoblitt
5cdd051dea add .vagrant to .gitignore 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
6ca22bd99c raise the "low bar" travis puppet version to 2.7.6 
It appears that puppet 2.7.3 does not play nicely with stdlib 4.2.0.
 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
8dedb6bffb Validate the concat::fragment order parameter as string||integer 
This is to work around a validation issue that arises under the 3.x future
parser, as proper numeric types have been introduced (ie, not all scalar values
are strings).  Users have come to expect to to be able to pass in unquoted
integer values to the order parameter which will fail to validate as a string
when the future parser is enabled.
 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
705071343b Merge pull request #186 from jhoblitt/feature/rb_concat_solaris 
enable the ruby concat script on Solaris
 2014-05-29 13:06:10 -07:00
Joshua Hoblitt
a4abf6f142 enable the ruby concat script on Solaris 
Per discussion on #174, Solaris 10 does not support the find/xargs
switches that were introduced in that PR (but Solaris 11 does).

+ add a shebang to concatfragments.rb
+ fix linter warnings/errors
 2014-05-29 12:52:38 -07:00