Diffusion puppet b01fc5f44150

Merge branch '2.7.x'
b01fc5f44150Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: Updating CHANGELOG and lib/puppet.rb for 2.7.12rc1 (#12572) Fix failing last run summary test on windows (#12188) Handle Win32 as well as Unix in pidfile tests. Updating CHANGELOG again for 2.7.11 (#12188) Better handling of PID file cleanup warnings. (#12572) Add acceptance test to make sure no last_run_summary diff is printed (#12572) Revert fix for #7106 and implement a more minimal fix

Details

Provenance

Patrick Carlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU5f0f26942858: Updating CHANGELOG and lib/puppet.rb for 2.7.12rc1
rPUefa6184786f2: Fix Windows test that was broken in merge from 2.7.x.

Branches

Unknown

Tags

Unknown

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUb01fc5f44150: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).Feb 27 2012, 9:39 PM

Merged Changes

5f0f26942858 Updating CHANGELOG and lib/puppet.rb for 2.7.12rc1
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
5a7b39d697fe Merge commit '7c5d1e4' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7c5d1e40d363 Merge pull request #6 from pcarlisle/ticket/2.7.x/12572-last-run-summary
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
c814c6b525c3 (#12572) Fix failing last run summary test on windows
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
87bcf3f6950b (#12188) Handle Win32 as well as Unix in pidfile tests.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
16d9af902203 Updating CHANGELOG again for 2.7.11
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
01b57e9c1a61 (#12188) Better handling of PID file cleanup warnings.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
411828be395a Merge pull request #5 from pcarlisle/ticket/2.7.x/12572-last-run-summary
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
a8b608807c11 (#12572) Add acceptance test to make sure no last_run_summary diff is printed
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
40480ed1aba8 (#12572) Revert fix for #7106 and implement a more minimal fix
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

acceptance/

tests/

ticket_12572_no_last_run_summary_diff.rb

lib/

puppet/

spec/

unit/

configurer_spec.rb

rPUb01fc5f44150

CHANGELOG

Loading...

acceptance/tests/ticket_12572_no_last_run_summary_diff.rb

Loading...

lib/puppet.rb

Loading...

lib/puppet/configurer.rb

Loading...

spec/unit/configurer_spec.rb

Loading...