Diffusion puppet-puppetlabs-concat 55cf9354bb02

Merge remote-tracking branch 'upstream/2.1.x'
55cf9354bb02
Actions

Description

Merge remote-tracking branch 'upstream/2.1.x'

Details

Provenance

Bryan Jen <bryan.jen@gmail.com>	Authored on Jan 29 2016, 9:32 PM
olasd	Pushed on Feb 26 2016, 9:36 AM

Parents

rSPCAT8d479b3efd69: Merge pull request #384 from bmjen/docs
rSPCATf3de39501992: Merge pull request #380 from DavidS/fm-4049-update-msync

Branches

Unknown

Tags

Unknown

Event Timeline

Bryan Jen <bryan.jen@gmail.com> committed rSPCAT55cf9354bb02: Merge remote-tracking branch 'upstream/2.1.x' (authored by Bryan Jen <bryan.jen@gmail.com>).Jan 29 2016, 9:32 PM

Merged Changes

8d479b3efd69 Merge pull request #384 from bmjen/docs
Author
Jean B <jean@puppetlabs.com>
Browse Repository
No Builds
No Audits
96454a8dce75 (maint) Minor fix in README
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
77dfe3c87c46 Merge pull request #383 from bmjen/2.1.0_prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
0bf6119a74cd (maint) Updates to CHANGELOG.
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
8f5d9e64820f Merge pull request #382 from bmjen/2.1.0_prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
83555da1287a (FM-4565) Release Prep for 2.1.0
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
fa008ec56d9d Merge pull request #381 from bmjen/fix-dir-deps
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
76d3c85a8d92 Fixes missing directory environment failure
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
7a91504663af Merge branch 'mergeup' into 2.0.x
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
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
02984313c1a4 Merge pull request #371 from bmjen/un-tableflip
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
ada9cef04a20 added tests to verify pup_1963 fix
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
e120baccc4d3 add .swp to the gitignore
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
bb31f28899c1 Merge pull request #370 from bmjen/fix-pr369
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
4faf84704a69 fixes resource reference in concat_file eval_generate return
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
a10097a04a50 Merge pull request #369 from sfu-rcg/2.0.x
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
5c5aa407e9e7 Should fix require, refresh dependencies
Author
asasfu <asa188@sfu.ca>
Browse Repository
No Builds
No Audits

Changes (39)

Path

Size

lib/

puppet/

manifests/

spec/

acceptance/

backup_spec.rb

concat_spec.rb

concurrency_spec.rb

deprecation_warnings_spec.rb

empty_spec.rb

fragment_source_spec.rb

order_spec.rb

pup-1963_spec.rb

replace_spec.rb

	warn_header_spec.rb
	warn_spec.rb

warn_spec.rb

warnings_spec.rb

spec_helper_acceptance.rb

unit/

classes

concat_setup_spec.rb

defines/

concat_fragment_spec.rb

concat_spec.rb

facts

concat_basedir_spec.rb

tests/

init.pp

rSPCAT55cf9354bb02

View Options

.fixtures.yml

View Options

.gitignore

View Options

CHANGELOG.md

View Options

README.md

View Options

files

View Options

files/concatfragments.rb

View Options

lib/facter

View Options

lib/facter/concat_basedir.rb

View Options

lib/puppet/parser

View Options

lib/puppet/parser/functions

View Options

lib/puppet/parser/functions/concat_getparam.rb

View Options

lib/puppet/parser/functions/concat_is_bool.rb

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

manifests/setup.pp

View Options

metadata.json

View Options

spec/acceptance/backup_spec.rb

View Options

spec/acceptance/concat_spec.rb

View Options

spec/acceptance/concurrency_spec.rb

View Options

spec/acceptance/deprecation_warnings_spec.rb

View Options

spec/acceptance/empty_spec.rb

View Options

spec/acceptance/fragment_source_spec.rb

View Options

spec/acceptance/order_spec.rb

View Options

spec/acceptance/pup-1963_spec.rb

View Options

spec/acceptance/replace_spec.rb

View Options

spec/acceptance/warn_header_spec.rb

View Options

spec/acceptance/warn_spec.rb

View Options

spec/acceptance/warnings_spec.rb

View Options

spec/spec_helper_acceptance.rb

View Options

spec/unit/classes

View Options

spec/unit/classes/concat_setup_spec.rb

View Options

spec/unit/defines/concat_fragment_spec.rb

View Options

spec/unit/defines/concat_spec.rb

View Options

spec/unit/facts

View Options

spec/unit/facts/concat_basedir_spec.rb

View Options

Merge remote-tracking branch 'upstream/2.1.x'55cf9354bb02Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rSPCAT55cf9354bb02

.fixtures.yml

.gitignore

CHANGELOG.md

README.md

files

files/concatfragments.rb

lib/facter

lib/facter/concat_basedir.rb

lib/puppet/parser

lib/puppet/parser/functions

lib/puppet/parser/functions/concat_getparam.rb

lib/puppet/parser/functions/concat_is_bool.rb

lib/puppet/type/concat_file.rb

lib/puppet/type/concat_fragment.rb

manifests/fragment.pp

manifests/init.pp

manifests/setup.pp

metadata.json

spec/acceptance/backup_spec.rb

spec/acceptance/concat_spec.rb

spec/acceptance/concurrency_spec.rb

spec/acceptance/deprecation_warnings_spec.rb

spec/acceptance/empty_spec.rb

spec/acceptance/fragment_source_spec.rb

spec/acceptance/order_spec.rb

spec/acceptance/pup-1963_spec.rb

spec/acceptance/replace_spec.rb

spec/acceptance/warn_header_spec.rb

spec/acceptance/warn_spec.rb

spec/acceptance/warnings_spec.rb

spec/spec_helper_acceptance.rb

spec/unit/classes

spec/unit/classes/concat_setup_spec.rb

spec/unit/defines/concat_fragment_spec.rb

spec/unit/defines/concat_spec.rb

spec/unit/facts

spec/unit/facts/concat_basedir_spec.rb

tests/init.pp

Merge remote-tracking branch 'upstream/2.1.x'
55cf9354bb02
Actions