Diffusion puppet-puppetlabs-concat 8d7d42788b5c

Merge pull request #328 from puppetlabs/2.0.x-to-master
8d7d42788b5cUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #328 from puppetlabs/2.0.x-to-master

2.0.x to master

Details

Provenance

Morgan Haskel <morgan@puppetlabs.com>	Authored on
olasd	Pushed on Sep 10 2015, 1:22 PM

Parents

rSPCAT75d1e9625211: Merge pull request #325 from bmjen/2.0.1_prep
rSPCAT186956397c45: Merge pull request #322 from DavidS/fixup-readme

Branches

Unknown

Tags

Unknown

Event Timeline

Morgan Haskel <morgan@puppetlabs.com> committed rSPCAT8d7d42788b5c: Merge pull request #328 from puppetlabs/2.0.x-to-master (authored by Morgan Haskel <morgan@puppetlabs.com>).Jun 3 2015, 7:43 PM

Merged Changes

75d1e9625211 Merge pull request #325 from bmjen/2.0.1_prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
d6ee5a8606d9 Release 2.0.1 prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
5267d3587c50 1.2.3 Release prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
ddcf87fe103f Merge pull request #321 from bmjen/empty-concats
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
6264171b3351 Merge pull request #319 from bmjen/add-file-autorequire
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
64b9288ac77c fix defaulted force behavior
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
78fdb4e794e0 adds file autorequire
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
e9ee044ef780 Merge pull request #318 from bmjen/frag-targeting
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
db3382992b29 fix fragment target handling
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
02c5f4b9f598 Merge pull request #317 from bmjen/tableflip
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
22927590249d fixes dependency bug in creating the target file
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

CHANGELOG.md

README.md

lib/

puppet/

type/

manifests/

spec/

acceptance/

concurrency_spec.rb

deprecation_warnings_spec.rb

fragment_source_spec.rb

	warnings_spec.rb
	deprecation_warnings_spec.rb

rSPCAT8d7d42788b5c

View Options

CHANGELOG.md

View Options

README.md

View Options

lib/puppet/type/concat_file.rb

View Options

lib/puppet/type/concat_fragment.rb

View Options

manifests/fragment.pp

View Options

manifests/init.pp

View Options

metadata.json

View Options

spec/acceptance/concurrency_spec.rb

View Options

spec/acceptance/deprecation_warnings_spec.rb

View Options

spec/acceptance/fragment_source_spec.rb

View Options

spec/acceptance/warnings_spec.rb

Merge pull request #328 from puppetlabs/2.0.x-to-master8d7d42788b5cUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (11)

rSPCAT8d7d42788b5c

CHANGELOG.md

README.md

lib/puppet/type/concat_file.rb

lib/puppet/type/concat_fragment.rb

manifests/fragment.pp

manifests/init.pp

metadata.json

spec/acceptance/concurrency_spec.rb

spec/acceptance/deprecation_warnings_spec.rb

spec/acceptance/fragment_source_spec.rb

spec/acceptance/warnings_spec.rb

Merge pull request #328 from puppetlabs/2.0.x-to-master
8d7d42788b5cUnpublished
Actions