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

456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jerome Charaoui
5f366454f9 Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-concat 
Conflicts:
	README.markdown
 2015-02-20 15:59:13 -05:00
Morgan Haskel
9b3f4b32d9 Merge pull request #271 from nibalizer/master 
Removing travis badge
 2015-02-19 14:02:48 -08:00
Spencer Krum
0e0dc74662 Removing travis badge 2015-02-19 14:01:05 -08:00
Travis Fields
f6e9f0a4ec Merge pull request #269 from mhaskel/merge_1.2.x_into_master 
Merge 1.2.x into master
 2015-02-17 15:31:51 -08:00
Morgan Haskel
3173e96697 1.2.0 prep 2015-02-17 15:30:31 -08:00
Travis Fields
c7c0e4ae5e Merge pull request #266 from mhaskel/remove_shell 
Remove shell script
 2015-02-17 11:07:08 -08:00
Morgan Haskel
7eb14b7768 Remove shell script 
The ruby script works just as well and works on all supported platforms. No need to maintain both.
 2015-02-13 13:16:59 -08:00
Hunter Haugen
20d0a5fde1 Merge pull request #265 from mhaskel/validation_test_fix 
The validation acceptance test is very Linux specific
 2015-02-12 16:07:53 -08:00
Morgan Haskel
36ff0ea613 The validation acceptance test is very Linux specific 2015-02-12 16:05:33 -08:00
JT (Jonny)
164a9a01a8 Merge pull request #263 from cmurphy/fix_validate_cmd 
Fix validate_cmd file resource parameter
 2015-02-12 11:22:50 +00:00
Colleen Murphy
a198e5db14 Fix validate_cmd file resource parameter 
The validate_cmd parameter is only valid on newer versions of puppet.
This module is supporting all 3.x versions of puppet. This commit only
applies the validate_cmd parameter to the file resource if it is
defined and adds documentation noting that it will not work on older
versons of puppet.
 2015-02-11 22:03:00 -08:00
Morgan Haskel
3a634af4aa Merge pull request #243 from jmkeyes/add-validation-command 
Support running a validation command on the destination file.
 2015-02-11 16:49:16 -08:00
Hunter Haugen
bccd7ed992 Merge pull request #262 from cyberious/master 
Fix Solaris 10 errors in tests and more issues with Windows checks of owner
 2015-02-11 05:30:14 -08:00
Travis Fields
520287fd05 Fix Solaris 10 errors in tests and more issues with Windows checks of owner 2015-02-10 22:36:14 -08:00
Hunter Haugen
88869c6aed Merge pull request #260 from cyberious/master 
MODULES-1764 Fix missing method for check_is_owned_by for windows
 2015-02-10 17:59:41 -08:00
Travis Fields
b9b13d2806 Currently sorting by numeric and the ruby file is not supported, this fixes that 2015-02-10 16:39:02 -08:00
Travis Fields
7bc211ceba MODULES-1764 Fix missing method for check_is_owned_by for windows 
Fix tests to use its(:content) instead of deprecated should contain
 2015-02-10 16:38:47 -08:00
Colleen Murphy
40200a6d84 Merge pull request #261 from mhaskel/merge_1.1.x_to_master 
MODULES-1456 - make sure ruby is in path on PE
 2015-02-10 12:51:24 -08:00
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
Joshua M. Keyes
0133d3ac49 Add acceptance test for validate_cmd parameter. 2014-11-15 16:52:38 -08:00
Joshua M. Keyes
79c5e45a24 Add unit tests for validate_cmd parameter. 2014-11-15 16:49:00 -08:00
Joshua M. Keyes
09a01d8087 Ensure validate_cmd is a string and fail explicitly otherwise. 2014-11-15 16:48:18 -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
Joshua M. Keyes
561935586d Support running a validation command on the destination file. 2014-11-12 19:25: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