Diffusion puppet-puppetlabs-concat 0613485f11fc

Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
0613485f11fcUnpublished
Actions

Tags

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x

Details

Provenance

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

Parents

rSPCATb69246a732c0: Merge pull request #244 from mhaskel/work_around_cert_issues
rSPCATd97a047e3591: Merge pull request #231 from GeoffWilliams/poison_exec_defaults_fix

Branches

Unknown

Tags

Unknown

Event Timeline

Morgan Haskel <morgan@puppetlabs.com> committed rSPCAT0613485f11fc: Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x (authored by Morgan Haskel <morgan@puppetlabs.com>).Nov 14 2014, 11:41 PM

Merged Changes

b69246a732c0 Merge pull request #244 from mhaskel/work_around_cert_issues
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c79d81a8fe47 Work around cert issues on solaris and windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (1)

Path

Size

spec/

spec_helper_acceptance.rb

rSPCAT0613485f11fc

spec/spec_helper_acceptance.rb

Loading...