Diffusion puppet-puppetlabs-concat ca98a145ca43

Merge pull request #377 from puppetlabs/1.2.x
ca98a145ca43
Actions

Tags

None

Subscribers

None

Description

Merge pull request #377 from puppetlabs/1.2.x

Mergeback 1.2.x

Details

Provenance

Helen <helen@puppetlabs.com>	Authored on Dec 8 2015, 5:26 PM
olasd	Pushed on Feb 26 2016, 9:36 AM

Parents

rSPCATa999bf26a118: Merge pull request #376 from HelenCampbell/release1.2.5
rSPCATb87f15578031: Merge pull request #375 from hunner/fix_crlf

Branches

Unknown

Tags

Unknown

Event Timeline

Helen <helen@puppetlabs.com> committed rSPCATca98a145ca43: Merge pull request #377 from puppetlabs/1.2.x (authored by Helen <helen@puppetlabs.com>).Dec 8 2015, 5:26 PM

Merged Changes

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
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
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

Changes (2)

Path

Size

rSPCATca98a145ca43

CHANGELOG.md

Loading...

metadata.json

Loading...