Diffusion puppet-puppetlabs-concat d3446f666c36

Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
d3446f666c36Unpublished
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

rSPCAT351d5f66e44e: Merge pull request #247 from mhaskel/work_around_cert_issues
rSPCAT5f5b892843e1: Merge pull request #245 from mhaskel/merge_1.1.x

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

351d5f66e44e Merge pull request #247 from mhaskel/work_around_cert_issues
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
dc9f4b3f6f46 Use a path that works on both 32 and 64-bit windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (1)

Path

Size

spec/

spec_helper_acceptance.rb

rSPCATd3446f666c36

spec/spec_helper_acceptance.rb

Loading...