Diffusion puppet-puppetlabs-concat 73c789663201

Merge pull request #239 from mhaskel/pull_master_to_1.1.x
73c789663201Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #239 from mhaskel/pull_master_to_1.1.x

Pull master to 1.1.x

Details

Provenance

Travis Fields <cyberious@users.noreply.github.com>	Authored on
olasd	Pushed on Sep 10 2015, 1:22 PM

Parents

rSPCATfe9730ab6cba: Merge pull request #238 from mhaskel/windows_cert_fix
rSPCAT0f43e1a4bdfe: Merge pull request #228 from mhaskel/moar_test_fixes

Branches

Unknown

Tags

Unknown

Event Timeline

Travis Fields <cyberious@users.noreply.github.com> committed rSPCAT73c789663201: Merge pull request #239 from mhaskel/pull_master_to_1.1.x (authored by Travis Fields <cyberious@users.noreply.github.com>).Oct 25 2014, 12:04 AM

Merged Changes

fe9730ab6cba Merge pull request #238 from mhaskel/windows_cert_fix
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
624ae75baabf Install certs on windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
644fb1b6dc8b Merge pull request #237 from mhaskel/strict_vars
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
0138787610db Strict variables test updates
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
1c35784fa026 Merge pull request #236 from mhaskel/metadata
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ddab08f9d1dc Update sles metadata
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
bffc8646f66e Merge pull request #235 from mhaskel/windows_test_fixes
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
9ece566992cb This *should* make tests pass on windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
0723aab6b60b Merge pull request #234 from mhaskel/windows_test_fixes
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
006eccc9bc1b Typo fixes
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
c40aa0f9a1fe Merge pull request #233 from mhaskel/windows_test_fixes
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
bc727a7a620b Don't test mode and symlinks on windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
3ed97157314f Merge pull request #232 from ghoneycutt/patch-1
Author
Joshua Hoblitt <jhoblitt@cpan.org>
Browse Repository
No Builds
No Audits
a8c563f14941 Update CHANGELOG.md
Author
Garrett Honeycutt <github@garretthoneycutt.com>
Browse Repository
No Builds
No Audits
fdbeb1bae417 Merge pull request #229 from mhaskel/test
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
1c44ec302648 Merge remote-tracking branch 'upstream/1.1.x' into test
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
84551cc4ec34 Merge pull request #205 from GeoffWilliams/windows_case_fix
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
c5f2f4772f0c Merge pull request #224 from puppetlabs/1.1.x
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
4fa5222cdd7e added missing line endings (-l) support for windows and solaris
Author
Geoff Williams <geoff.williams@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

CHANGELOG.md

metadata.json

spec/

acceptance/

concat_spec.rb

deprecation_warnings_spec.rb

replace_spec.rb

spec_helper_acceptance.rb

unit/

classes/

concat_setup_spec.rb

defines/

concat_fragment_spec.rb

concat_spec.rb

rSPCAT73c789663201

View Options

CHANGELOG.md

View Options

metadata.json

View Options

spec/acceptance/concat_spec.rb

View Options

spec/acceptance/deprecation_warnings_spec.rb

View Options

spec/acceptance/replace_spec.rb

View Options

spec/spec_helper_acceptance.rb

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

Merge pull request #239 from mhaskel/pull_master_to_1.1.x73c789663201UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (9)

rSPCAT73c789663201

CHANGELOG.md

metadata.json

spec/acceptance/concat_spec.rb

spec/acceptance/deprecation_warnings_spec.rb

spec/acceptance/replace_spec.rb

spec/spec_helper_acceptance.rb

spec/unit/classes/concat_setup_spec.rb

spec/unit/defines/concat_fragment_spec.rb

spec/unit/defines/concat_spec.rb

Merge pull request #239 from mhaskel/pull_master_to_1.1.x
73c789663201Unpublished
Actions