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

399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Fields
73c7896632 Merge pull request #239 from mhaskel/pull_master_to_1.1.x 
Pull master to 1.1.x
 2014-10-24 15:04:43 -07:00
Travis Fields
fe9730ab6c Merge pull request #238 from mhaskel/windows_cert_fix 
Install certs on windows
 2014-10-24 14:18:17 -07:00
Morgan Haskel
624ae75baa Install certs on windows 
This should allow the install of stdlib to succeed.
 2014-10-24 16:16:20 -05:00
Hunter Haugen
644fb1b6dc Merge pull request #237 from mhaskel/strict_vars 
Strict variables test updates
 2014-10-08 15:18:08 -07:00
Morgan Haskel
0138787610 Strict variables test updates 2014-10-08 18:06:15 -04:00
Colleen Murphy
1c35784fa0 Merge pull request #236 from mhaskel/metadata 
Update sles metadata
 2014-10-08 13:46:02 -07:00
Morgan Haskel
ddab08f9d1 Update sles metadata 2014-10-08 13:59:14 -04:00
Colleen Murphy
bffc8646f6 Merge pull request #235 from mhaskel/windows_test_fixes 
This *should* make tests pass on windows
 2014-10-07 13:31:57 -07:00
Morgan Haskel
9ece566992 This *should* make tests pass on windows 2014-10-07 15:19:22 -04:00
Colleen Murphy
0723aab6b6 Merge pull request #234 from mhaskel/windows_test_fixes 
Typo fixes
 2014-10-03 13:05:57 -07:00
Morgan Haskel
006eccc9bc Typo fixes 2014-10-03 15:22:37 -04:00
Travis Fields
c40aa0f9a1 Merge pull request #233 from mhaskel/windows_test_fixes 
Don't test mode and symlinks on windows
 2014-10-03 12:09:20 -07:00
Morgan Haskel
bc727a7a62 Don't test mode and symlinks on windows 2014-10-03 15:01:20 -04:00
Joshua Hoblitt
3ed9715731 Merge pull request #232 from ghoneycutt/patch-1 
Update CHANGELOG.md
 2014-09-21 22:02:42 -07:00
Garrett Honeycutt
a8c563f149 Update CHANGELOG.md 2014-09-22 00:57:50 -04:00
Colleen Murphy
fdbeb1bae4 Merge pull request #229 from mhaskel/test 
merge 1.1.x into master
 2014-09-12 12:00:44 -07:00
Morgan Haskel
1c44ec3026 Merge remote-tracking branch 'upstream/1.1.x' into test 2014-09-12 14:52:26 -04:00
Travis Fields
0f43e1a4bd Merge pull request #228 from mhaskel/moar_test_fixes 
Windows fixes
 2014-09-11 12:51:04 -07:00
Morgan Haskel
6f86a98066 Windows fixes 2014-09-11 15:41:41 -04:00
Colleen Murphy
9948d04a8f Merge pull request #227 from mhaskel/moar_test_fixes 
Windows and solaris fixes
 2014-09-11 11:07:53 -07:00
Morgan Haskel
d45f1e60d7 Windows and solaris fixes 
Solaris doesn't support multi-line grep. More fixes for install on
windows.
 2014-09-11 14:03:07 -04:00
Colleen Murphy
b61089a970 Merge pull request #226 from mhaskel/moar_test_fixes 
Try to remove all the platform dependent stuff
 2014-09-11 09:53:06 -07:00
Morgan Haskel
0cb0b1ab0b Work-around. 2014-09-11 12:46:42 -04:00
Morgan Haskel
344f6adb36 Try to remove all the platform dependent stuff 
And updated the tests to work as planned
 2014-09-11 12:18:05 -04:00
Morgan Haskel
13c7653f57 Merge pull request #225 from mhaskel/ensure_newline_cherrypick 
added missing line endings (-l) support for windows and solaris
 2014-09-11 11:35:48 -04:00
Geoff Williams
41d8273dfe added missing line endings (-l) support for windows and solaris 2014-09-11 11:34:28 -04:00
Morgan Haskel
64a19f4d48 Merge pull request #222 from cyberious/CopyModuleTo 
Remove deprecated puppet_module_install in favor of copy_module_to
 2014-09-11 11:33:13 -04:00
Morgan Haskel
84551cc4ec Merge pull request #205 from GeoffWilliams/windows_case_fix 
added missing line endings (-l) support for windows and solaris
 2014-09-11 11:33:01 -04:00
Morgan Haskel
c5f2f4772f Merge pull request #224 from puppetlabs/1.1.x 
1.1.x
 2014-09-10 19:29:37 -04:00
Hunter Haugen
ee552804c2 Merge pull request #223 from mhaskel/test_merge 
Merge tests from 1.0.x
 2014-09-10 16:27:06 -07:00
Morgan Haskel
f81ef495e3 Fixing up tests 2014-09-10 19:11:28 -04:00
Morgan Haskel
5f17a26256 Merge branch '1.0.x' into test_merge 
Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	README.markdown
	Rakefile
	files/concatfragments.sh
	manifests/setup.pp
	metadata.json
	spec/acceptance/backup_spec.rb
	spec/acceptance/concat_spec.rb
	spec/acceptance/empty_spec.rb
	spec/acceptance/fragment_source_spec.rb
	spec/acceptance/newline_spec.rb
	spec/acceptance/nodesets/centos-64-x64.yml
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/fedora-18-x64.yml
	spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
	spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
	spec/acceptance/order_spec.rb
	spec/acceptance/replace_spec.rb
	spec/acceptance/symbolic_name_spec.rb
	spec/acceptance/warn_spec.rb
	spec/spec_helper_acceptance.rb
 2014-09-10 15:03:35 -04:00
Travis Fields
968dac5a31 Remove deprecated puppet_module_install in favor of copy_module_to 2014-09-10 10:07:24 -07:00
Hunter Haugen
6a1f3aaf94 Merge pull request #221 from mhaskel/no_more_unsupported 
There are no UNSUPPORTED_PLATFORMS defined for 1.1
 2014-09-10 09:29:39 -07:00
Morgan Haskel
a6590ba98d There are no UNSUPPORTED_PLATFORMS defined for 1.1 2014-09-10 12:26:28 -04:00
Morgan Haskel
5c56ec134f Merge pull request #220 from mhaskel/test_updates_from_1.0.x 
'wheel' is the root group for osx.
 2014-09-09 23:36:31 -04:00
Morgan Haskel
98d70da9fd 'wheel' is the root group for osx. 
Conflicts:
	spec/acceptance/concat_spec.rb
	spec/acceptance/fragment_source_spec.rb
 2014-09-09 23:34:08 -04:00
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