Diffusion puppet-puppetlabs-concat 7a91504663af

Merge branch 'mergeup' into 2.0.x
7a91504663af
Actions

Description

Merge branch 'mergeup' into 2.0.x

Details

Provenance

Bryan Jen <bryan.jen@gmail.com>	Authored on Jan 22 2016, 1:39 AM
olasd	Pushed on Feb 26 2016, 9:36 AM

Parents

rSPCAT7d35d567ac0b: Merge remote-tracking branch 'upstream/master' into mergeup
rSPCAT02984313c1a4: Merge pull request #371 from bmjen/un-tableflip

Branches

Unknown

Tags

Unknown

Event Timeline

Bryan Jen <bryan.jen@gmail.com> committed rSPCAT7a91504663af: Merge branch 'mergeup' into 2.0.x (authored by Bryan Jen <bryan.jen@gmail.com>).Jan 22 2016, 1:39 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

7d35d567ac0b Merge remote-tracking branch 'upstream/master' into mergeup
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
f4241b5ffea6 (MODULES-2998) Re-sync concat to 2.0.x version
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
ca98a145ca43 Merge pull request #377 from puppetlabs/1.2.x
Author
Helen <helen@puppetlabs.com>
Browse Repository
No Builds
No Audits
a999bf26a118 Merge pull request #376 from HelenCampbell/release1.2.5
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
b77fa845e63b Release 1.2.5
Author
Helen Campbell <helen@puppetlabs.com>
Browse Repository
No Builds
No Audits
b87f15578031 Merge pull request #375 from hunner/fix_crlf
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
6aebec53cf4a (maint) Fix line endings
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
685cc74a759c Merge pull request #368 from jdkindy/MODULES-1678
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
a7789fa7e852 MODULES-1678: Add show_diff functionality to concat and concat::fragment
Author
Jeremy Kindy <kindyjd@wfu.edu>
Browse Repository
No Builds
No Audits
53d5950e2b51 Merge pull request #373 from karyon/fix_line_endings
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f527236eaaf7 Fix line endings on windows
Author
Johannes Linke <johannes.linke@posteo.de>
Browse Repository
No Builds
No Audits
c307bee3933d Merge pull request #366 from thrnio/fix_spec_vagrant
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
8484bc507214 Merge pull request #367 from thrnio/allow_integer_owner
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
a6ebae9857e4 Allow integer UID/GID for $owner/$group
Author
Ryan Whitehurst <ryan@ryanwhitehurst.com>
Browse Repository
No Builds
No Audits
5efd30a0e193 (MODULES-2572) Fix acceptance test vagrant URLs
Author
Ryan Whitehurst <ryan@ryanwhitehurst.com>
Browse Repository
No Builds
No Audits
fd4f1e2d46a8 Merge pull request #361 from jhoblitt/feature/selinux
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
60051ae55d1d add log/ to .gitignore
Author
Joshua Hoblitt <josh@hoblitt.com>
Browse Repository
No Builds
No Audits
ff1e65a90138 (MODULES-2303) add selinux related params to concat type
Author
Joshua Hoblitt <josh@hoblitt.com>
Browse Repository
No Builds
No Audits
e250a262a5d8 Merge pull request #364 from bmjen/fix-frag-backup
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca58571ab2fd (MODULES-1700) Re-factored original fix, to not default to backing up fragments.
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
370e38aafe9a Merge pull request #363 from jhoblitt/fix-broken-backup
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
b6f1ac1d359f (MODULES-1700) remove all reliance on resource defaults
Author
Joshua Hoblitt <josh@hoblitt.com>
Browse Repository
No Builds
No Audits
fede2461c1cf Never backup fragments, no matter what $backup for concat resource is used
Author
Jérôme Vizcaino <jerome.vizcaino@gmail.com>
Browse Repository
No Builds
No Audits
65a7cf290412 Merge pull request #360
Author
Joshua Hoblitt <josh@hoblitt.com>
Browse Repository
No Builds
No Audits
a2afcb12ba93 Merge pull request #362 from puppetlabs/revert-359-fix-broken-backup
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
6ba6cd2134b0 Revert "Backup option breaks concat"
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
ac28069b1392 Merge pull request #358 from buzzdeee/master
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
7c13aaeb94a8 Merge pull request #359 from j-vizcaino/fix-broken-backup
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
ded2316c64f7 Never backup fragments, no matter what $backup for concat resource is used
Author
Jérôme Vizcaino <jerome.vizcaino@gmail.com>
Browse Repository
No Builds
No Audits
d5c305c2bf03 Recent OpenBSD changed to ruby22 as default interpreter, that now is also used…
Author
Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
Browse Repository
No Builds
No Audits
b957bb977899 Merge pull request #357 from mhaskel/revert-sol12
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
05426bb26b05 Revert "Add support for Solaris 12"
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb022ee64c37 Merge pull request #355 from mhaskel/1.2.4-prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
db914f198855 1.2.4 prep
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
89fceb4bc3d0 Merge pull request #354 from bmjen/merge-master
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
d336ea0c58d7 Merge pull request #352 from mhaskel/pe_next_fixes
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
c129edffca64 Use AIO ruby if available
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
c47e72c5c4da Merge pull request #351 from hunner/mergeback
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
afe258a6b4d1 Merge remote-tracking branch 'puppetlabs/1.2.x'
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
848554e0f21f Merge pull request #350 from mhaskel/pe_next_fixes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
408633fd9607 Missed a typo
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
e936813e0889 Merge pull request #348 from gwollman/bug/master/FreeBSD-ruby-interpreter
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
2f82480febfa Merge pull request #349 from mhaskel/pe_next_fixes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
a72be83df351 Use the correct vardir in the tests
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
839de048afd4 (#2208) FreeBSD: call /usr/local/bin/ruby explicitly
Author
Garrett Wollman <wollman@csail.mit.edu>
Browse Repository
No Builds
No Audits
adb17a4bc835 Merge pull request #344 from drewfisher314/ticket/2135-add-solaris-12
Author
JT (Jonny) <jonathan.tripathy@puppetlabs.com>
Browse Repository
No Builds
No Audits
47359c3804a6 Merge pull request #347 from mhaskel/aio_fix
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
967880fc4a96 check for nil
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
b36f071d6558 Merge pull request #346 from mhaskel/aio_fix
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
f6545611739a Default test vardir to the aio paths for *nix systems
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (27)

Path

Size

lib/

puppet/

type/

concat_file.rb

manifests/

init.pp

metadata.json

spec/

acceptance/

nodesets/

ubuntu-server-10044-x64.yml

ubuntu-server-12042-x64.yml

quoted_paths_spec.rb

spec_helper_acceptance.rb

unit/

defines/

concat_fragment_spec.rb

concat_spec.rb

tests/

fragment.pp

rSPCAT7a91504663af

View Options

.gitattributes

View Options

.gitignore

View Options

CHANGELOG.md

View Options

Gemfile

View Options

README.md

View Options

lib/puppet/type/concat_file.rb

View Options

manifests/init.pp

View Options

metadata.json

View Options

spec/acceptance/concat_spec.rb

View Options

spec/acceptance/nodesets/centos-59-x64.yml

View Options

spec/acceptance/nodesets/centos-64-x64-pe.yml

View Options

spec/acceptance/nodesets/centos-64-x64.yml

View Options

spec/acceptance/nodesets/centos-65-x64.yml

View Options

spec/acceptance/nodesets/debian-607-x64.yml

View Options

spec/acceptance/nodesets/debian-70rc1-x64.yml

View Options

spec/acceptance/nodesets/debian-73-x64.yml

View Options

spec/acceptance/nodesets/default.yml

View Options

spec/acceptance/nodesets/fedora-18-x64.yml

View Options

spec/acceptance/nodesets/sles-11-x64.yml

View Options

spec/acceptance/nodesets/sles-11sp1-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

View Options

spec/acceptance/quoted_paths_spec.rb

View Options

spec/spec_helper_acceptance.rb

View Options

spec/unit/defines/concat_fragment_spec.rb

View Options

spec/unit/defines/concat_spec.rb

View Options

Merge branch 'mergeup' into 2.0.x7a91504663afActions

Description

Details

Event Timeline

Merged Changes

Changes (27)

rSPCAT7a91504663af

.gitattributes

.gitignore

CHANGELOG.md

Gemfile

README.md

lib/puppet/type/concat_file.rb

manifests/init.pp

metadata.json

spec/acceptance/concat_spec.rb

spec/acceptance/nodesets/centos-59-x64.yml

spec/acceptance/nodesets/centos-64-x64-pe.yml

spec/acceptance/nodesets/centos-64-x64.yml

spec/acceptance/nodesets/centos-65-x64.yml

spec/acceptance/nodesets/debian-607-x64.yml

spec/acceptance/nodesets/debian-70rc1-x64.yml

spec/acceptance/nodesets/debian-73-x64.yml

spec/acceptance/nodesets/default.yml

spec/acceptance/nodesets/fedora-18-x64.yml

spec/acceptance/nodesets/sles-11-x64.yml

spec/acceptance/nodesets/sles-11sp1-x64.yml

spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

spec/acceptance/quoted_paths_spec.rb

spec/spec_helper_acceptance.rb

spec/unit/defines/concat_fragment_spec.rb

spec/unit/defines/concat_spec.rb

tests/fragment.pp

Merge branch 'mergeup' into 2.0.x
7a91504663af
Actions