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

377 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Joshua Hoblitt
ad11960250 Merge pull request #183 from misterdorm/order_string 
Change default 'order' parameter to be a string
 2014-05-21 16:59:50 -07:00
Ashley Penney
03cee3f116 Merge pull request #184 from mhaskel/1.0.3-prep 
1.0.3 prep
 2014-05-21 16:31:08 -07:00
Morgan Haskel
379e273e2e Update PE version requirement. 2014-05-21 19:28:25 -04:00
Mike Dorman
cd645a8360 Change default 'order' parameter to be a string 
Under Puppet 3.5.1 (and possibly earlier versions, too), the validate_string($order)
fails when $order is actaully a numeric type.  Apparently there is more strict type
checking now.  Can't just change validate_string to a is_numeric check, because it's
fairly common to use strings like '01' for the order parameter, which doesn't pass
the is_numeric test.  Additionally, there is nothing saying that $order must be a
number.  Ultimately the ordering gets implemented as filesystem directory list
sorting.
 2014-05-21 17:06:37 -06:00
Hunter Haugen
805ea0870d Merge pull request #182 from mhaskel/1.0.3-prep 
1.0.3 prep
 2014-05-20 11:05:08 -07:00
Morgan Haskel
43a0313ba9 Update version in metadata.json. 2014-05-20 14:03:28 -04:00
Ashley Penney
8f5c30c6a3 Claim PE3.3 support. 2014-05-15 14:58:07 -04:00
Ashley Penney
9cd6fad9ae Merge pull request #181 from mhaskel/1.1.0-release 
Update CHANGELOG and Modulefile for 1.1.0 release.
 2014-05-14 17:52:27 -04:00
Morgan Haskel
a50226b4ec Update CHANGELOG and Modulefile for 1.1.0 release. 2014-05-14 17:31:04 -04:00
Ashley Penney
c4695b6d5f Merge pull request #180 from mhaskel/1.0.3-prep 
1.0.3 prep
 2014-05-14 16:42:44 -04:00
Morgan Haskel
fc56fe3d7c Update changelog, modulefile and metadata.json for supported 1.0.3 release. 2014-05-14 16:41:34 -04:00
Ashley Penney
3f4165a106 Merge pull request #179 from mhaskel/add-ubuntu-nodeset 
Add nodeset for ubuntu trusty.
 2014-05-14 16:20:05 -04:00
Ashley Penney
18f42ad8de Merge pull request #178 from mhaskel/ubuntu-test-fixes 
Fixes to get tests running on trusty.
 2014-05-14 16:15:14 -04:00
Morgan Haskel
6b9e8ddc37 Add nodeset for ubuntu trusty. 2014-05-14 16:14:53 -04:00
Morgan Haskel
33b90b4fbc Fixes to get tests running on trusty. 2014-05-14 16:10:03 -04:00
mhaskel
7ede29bd8e Merge pull request #175 from apenney/fix-1404 
Improve this so it works on Ubuntu 14.04.
 2014-05-02 10:53:45 -07:00
Ashley Penney
8a1965ade9 Improve this so it works on Ubuntu 14.04. 2014-05-02 19:50:51 +02:00
Ashley Penney
6a3bdd03fa Merge pull request #174 from bdeak/fix_numeric_sorting 
fix numeric sorting
 2014-05-01 16:10:55 -04:00
mhaskel
fca35a0567 Merge pull request #152 from lweller/issue_151 
ignore mode and owner on windows
 2014-05-01 11:10:40 -07:00
Balint Deak
9590b7cb8a fix numeric sorting 2014-04-25 10:47:57 +02:00
Ashley Penney
a278e5063c Merge pull request #172 from apenney/fix-newlines 
Fix newlines.
 2014-04-21 19:24:09 -04:00
Ashley Penney
a2df44a967 Fix newlines. 
Previously the newline handling modified the actual fragments, causing
multiple runs to always update the newlines.  Handle this appropriately.
 2014-04-21 18:36:59 -04:00