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

415 commits

This branch
This branch
All branches
Author SHA1 Message Date
Toni Schmidbauer
4fc1dfc462 use concatfragments.rb on AIX 
AIX find does not support the print0 option. It's basically the same as on Solaris:

Debug: Executing '/var/lib/puppet/concat/bin/concatfragments.sh -o "/var/lib/puppet/concat/_var_ossec_etc_ossec-agent.conf/fragments.concat.out" -d "/var/lib/puppet/concat/_var_ossec_etc_ossec-agent.conf" -t'
Debug: /Stage[main]/Ossec::Client/Concat[/var/ossec/etc/ossec-agent.conf]/Exec[concat_/var/ossec/etc/ossec-agent.conf]/unless: find: bad option -print0
 2014-11-18 13:55:53 +01:00
Travis Fields
708def1aeb Merge pull request #248 from mhaskel/merge_1.1.x 
Merge 1.1.x
 2014-11-17 10:58:07 -08:00
Morgan Haskel
d3446f666c Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x 2014-11-17 10:54:39 -08:00
Travis Fields
351d5f66e4 Merge pull request #247 from mhaskel/work_around_cert_issues 
Use the correct path on 32bit windows
 2014-11-17 10:30:19 -08:00
Morgan Haskel
dc9f4b3f6f Use a path that works on both 32 and 64-bit windows 2014-11-17 10:28:43 -08:00
Travis Fields
5f5b892843 Merge pull request #245 from mhaskel/merge_1.1.x 
Merge 1.1.x
 2014-11-14 14:42:59 -08:00
Morgan Haskel
0613485f11 Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x 2014-11-14 14:41:31 -08:00
Travis Fields
b69246a732 Merge pull request #244 from mhaskel/work_around_cert_issues 
Work around cert issues on solaris and windows
 2014-11-14 14:39:27 -08:00
Morgan Haskel
c79d81a8fe Work around cert issues on solaris and windows 
This should allow the tests to work.
 2014-11-14 14:38:01 -08:00
Travis Fields
d97a047e35 Merge pull request #231 from GeoffWilliams/poison_exec_defaults_fix 
Reset poisoned defaults from Exec
 2014-10-28 22:00:45 -07:00
Colleen Murphy
520224fbe1 Merge pull request #242 from mhaskel/test 
merge 1.1.x into master
 2014-10-28 12:37:08 -07:00
Colleen Murphy
ab06c2b8c0 Merge pull request #241 from cyberious/InstallCert 
Use apply manifest instead of timeout transaction if it hangs
 2014-10-27 16:04:58 -07:00
Travis Fields
8cb4c2447a Use apply manifest instead of timeout transaction if it does hang 2014-10-27 16:03:36 -07:00
Colleen Murphy
75dd725179 Merge pull request #240 from mhaskel/1.1.2-prep 
1.1.2 prep
 2014-10-24 15:18:56 -07:00
Morgan Haskel
ea3d6e3146 1.1.2 prep 2014-10-24 17:16:32 -05:00
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
Geoff Williams
ed6efe8972 Reset poisoned defaults from Exec 2014-09-18 21:00:05 +10: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