HomePhorge

Merge branch '2.7.x'
daee52047b97Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

  • 2.7.x: Fix communication_error acceptance test Use :as_platform in the smf service spec Use :as_platform in the redhat service spec (#13690) add comments to spec_helper (#12392) Don't require eventlog gem on non-Windows platforms Updating CHANGELOG and lib/puppet.rb for 2.7.13 (#13690) Update 2.7.x for spec_helper compatibility with external projects (#12392) Add eventlog destination and log to it by default on Windows Stub mktmpdir and remove_entry_secure in os x package providers (#13260) Spec test to verify that mktmpdir is used (#12392) Created Windows eventlog message resource dll (#13260) Use mktmpdir when downloading packages Refactor pkgdmg specs Remove telnet Output_log parameter Fix for bucket_path security vulnerability Removed text/marshal support (#12466) unset X-Forwarded-For header (#13204) Workaround duplicate Augeas save events

Conflicts:
lib/puppet/util/settings.rb
spec/spec_helper.rb

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUdaee52047b97: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).Apr 12 2012, 4:12 AM

Merged Changes