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

432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morgan Haskel
3b2e37ab1e MODULES-1456 - make sure ruby is in path on PE 
Ruby is not in the path for all PE installations, so make sure the
concat script is run with ruby in the path.
 2015-02-10 12:05:12 -08:00
Hunter Haugen
fa5c1cfac3 Merge pull request #249 from nosolutions/master 
use concatfragments.rb on AIX
 2015-02-06 10:43:12 -08:00
Hunter Haugen
9036086db6 Merge pull request #258 from cmurphy/rspec 
Pin rspec gems
 2015-02-04 12:03:48 -08:00
Colleen Murphy
aacf1bd5e1 Pin rspec gems 2015-02-04 17:02:03 +01:00
Morgan Haskel
2518958db0 Merge pull request #256 from cyberious/BeakerRspecPin 
Beaker-Rspec broken on Windows, enable ability to pin to older version until fixed
 2015-01-14 13:02:14 -08:00
Travis Fields
7d49b5f4f8 Beaker-Rspec broken on Windows, enable ability to pin to older version until fixed 2015-01-14 13:01:14 -08:00
jonnytpuppet
be933446dc Merge pull request #255 from hunner/fix_pending 
Fix pending tests
 2015-01-13 14:30:38 -08:00
Hunter Haugen
cff25a8b60 Fix pending tests 
With rspec 3, pending() started inverting the logic so that if a
pending tests succeeds then it fails (so you can block on a future
change). These tests have no body so will always succeed.

Anyway, pending -> skip reverts the logic to the usual.
 2015-01-09 16:53:09 -08:00
Morgan Haskel
7ed3f566c6 Merge pull request #254 from cmurphy/master 
Add IntelliJ files to the ignore list
 2014-12-29 11:23:37 -08:00
Colleen Murphy
ce90edc4b7 Add IntelliJ files to the ignore list 2014-12-29 10:40:57 -08:00
Morgan Haskel
aab8e17cac Merge pull request #250 from laurenrother/summary 
Add metadata summary per FM-1523
 2014-12-19 12:00:58 -08:00
Morgan Haskel
dbf3124b96 Merge pull request #252 from cmurphy/master 
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
 2014-12-09 08:21:15 -08:00
Colleen Murphy
ee87c65641 Add json gem 
The puppet_facts gem implicitly depends on the json gem.
On Ruby 1.8.7, json is not built in. On Puppet 2.7, it is
not explicitly pulled in by the hiera gem. So we add it
here explicitly.
 2014-12-08 22:52:10 -08:00
Colleen Murphy
440a6b7be3 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md 2014-12-08 10:23:21 -08:00
Morgan Haskel
8fb09fbcc9 Merge pull request #251 from cmurphy/puppet_27 
Define travis matrix in .sync.yml
 2014-12-08 10:20:15 -08:00
Colleen Murphy
6f1e97a916 Define travis matrix in .sync.yml 
Since the other modules need to wait for a major release before
deprecating Puppet 2.7 support, this module's travis.yml is out of sync
and will need to stay that way for a while.
 2014-12-07 13:27:57 -08:00
Lauren Rother
027484da3a Add metadata summary per FM-1523 2014-11-20 15:20:31 -08:00
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