Diffusion puppet-puppetlabs-concat 5f5b892843e1

Merge pull request #245 from mhaskel/merge_1.1.x
5f5b892843e1Unpublished
Actions

Tags

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #245 from mhaskel/merge_1.1.x

Merge 1.1.x

Details

Provenance

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

Parents

rSPCAT0613485f11fc: Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
rSPCATd97a047e3591: Merge pull request #231 from GeoffWilliams/poison_exec_defaults_fix

Branches

Unknown

Tags

Unknown

Event Timeline

Travis Fields <cyberious@users.noreply.github.com> committed rSPCAT5f5b892843e1: Merge pull request #245 from mhaskel/merge_1.1.x (authored by Travis Fields <cyberious@users.noreply.github.com>).Nov 14 2014, 11:42 PM

Merged Changes

0613485f11fc Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
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

rSPCAT5f5b892843e1

spec/spec_helper_acceptance.rb

Loading...