Commit graph

452 commits

Author SHA1 Message Date
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
Geoff Williams
4fa5222cdd added missing line endings (-l) support for windows and solaris 2014-07-09 16:11:08 +10: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
Ashley Penney
cf366e26a8 Merge pull request #196 from mhaskel/prep-1.0.4
Prep 1.0.4
2014-06-17 11:03:10 -04:00
Morgan Haskel
070f184ce3 Prep for 1.0.4 release. 2014-06-17 11:00:54 -04:00
Hunter Haugen
7cd6cf9411 Merge pull request #193 from mhaskel/osx-test-fixes
Osx test fixes
2014-06-11 14:26:30 -07:00
Morgan Haskel
90f70e86a3 'wheel' is the root group for osx. 2014-06-11 17:25:08 -04:00
Travis Fields
c7461c5beb Merge pull request #192 from mhaskel/beaker-rspec-fix
Beaker rspec fix
2014-06-09 14:13:43 -07:00
Morgan Haskel
d25226e36a Try to force it to use the correct version of beaker-rspec. 2014-06-09 17:11:51 -04:00
Travis Fields
fb3c4affad Merge pull request #191 from apenney/pin-rspec
Pin rspec
2014-06-09 08:38:52 -07:00
Ashley Penney
c0a918e4f3 Pin rspec to 2.x. 2014-06-09 11:30:17 -04:00
Hunter Haugen
dbfe7a32dd Merge pull request #189 from apenney/103-release
103 release
2014-06-04 11:09:16 -07:00
Ashley Penney
13ae29d24b Update for the 1.0.3 release being unsupported. 2014-06-04 14:08:35 -04:00
Morgan Haskel
3465fe703e Merge pull request #188 from apenney/fix-tests
Remove all the eq() checks as this breaks in PE3.3.
2014-06-02 16:12:38 -04:00
Ashley Penney
f66ca3c1b7 Remove all the eq() checks as this breaks in PE3.3. 2014-06-02 16:10:29 -04: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