Diffusion puppet-puppetlabs-concat fdbeb1bae417

Merge pull request #229 from mhaskel/test
fdbeb1bae417Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #229 from mhaskel/test

merge 1.1.x into master

Details

Provenance

Colleen Murphy <cmurphy@users.noreply.github.com>	Authored on
olasd	Pushed on Sep 10 2015, 1:22 PM

Parents

rSPCAT1c44ec302648: Merge remote-tracking branch 'upstream/1.1.x' into test
rSPCAT84551cc4ec34: Merge pull request #205 from GeoffWilliams/windows_case_fix

Branches

Unknown

Tags

Unknown

Event Timeline

Colleen Murphy <cmurphy@users.noreply.github.com> committed rSPCATfdbeb1bae417: Merge pull request #229 from mhaskel/test (authored by Colleen Murphy <cmurphy@users.noreply.github.com>).Sep 12 2014, 9:00 PM

Merged Changes

1c44ec302648 Merge remote-tracking branch 'upstream/1.1.x' into test
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
0f43e1a4bdfe Merge pull request #228 from mhaskel/moar_test_fixes
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
6f86a98066ea Windows fixes
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
9948d04a8f96 Merge pull request #227 from mhaskel/moar_test_fixes
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
d45f1e60d7cc Windows and solaris fixes
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
b61089a9704e Merge pull request #226 from mhaskel/moar_test_fixes
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
0cb0b1ab0b27 Work-around.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
344f6adb3691 Try to remove all the platform dependent stuff
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
13c7653f57bd Merge pull request #225 from mhaskel/ensure_newline_cherrypick
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
41d8273dfe21 added missing line endings (-l) support for windows and solaris
Author
Geoff Williams <geoff.williams@puppetlabs.com>
Browse Repository
No Builds
No Audits
64a19f4d485f Merge pull request #222 from cyberious/CopyModuleTo
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
968dac5a311e Remove deprecated puppet_module_install in favor of copy_module_to
Author
Travis Fields <travis@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

spec/

acceptance/

concat_spec.rb

deprecation_warnings_spec.rb

fragments_are_always_replaced_spec.rb

newline_spec.rb

quoted_paths_spec.rb

replace_spec.rb

spec_helper_acceptance.rb

rSPCATfdbeb1bae417

View Options

spec/acceptance/concat_spec.rb

View Options

spec/acceptance/deprecation_warnings_spec.rb

View Options

spec/acceptance/fragments_are_always_replaced_spec.rb

View Options

spec/acceptance/newline_spec.rb

View Options

spec/acceptance/quoted_paths_spec.rb

View Options

spec/acceptance/replace_spec.rb

View Options

spec/spec_helper_acceptance.rb

Merge pull request #229 from mhaskel/testfdbeb1bae417UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (7)

rSPCATfdbeb1bae417

spec/acceptance/concat_spec.rb

spec/acceptance/deprecation_warnings_spec.rb

spec/acceptance/fragments_are_always_replaced_spec.rb

spec/acceptance/newline_spec.rb

spec/acceptance/quoted_paths_spec.rb

spec/acceptance/replace_spec.rb

spec/spec_helper_acceptance.rb

Merge pull request #229 from mhaskel/test
fdbeb1bae417Unpublished
Actions