Diffusion puppet e430a8bf5c57

Merge branch 'pr/2549'
e430a8bf5c57Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'pr/2549'

pr/2549: (PUP-2298) Use resource specific log_exception (PUP-2298) protect transaction spec test against new exceptions (PUP-2298) add resource lifecycle method Puppet::Type#pre_run_check

Closes GH-2549

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU3062b78db582: (PUP-2298) Use resource specific log_exception
rPU9df9928c28d5: Merge branch 'ticket/master/PUP-1070-cleanup-invalid-lockfiles'

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUe430a8bf5c57: Merge branch 'pr/2549' (authored by Josh Cooper <josh@puppetlabs.com>).May 28 2014, 10:56 PM

Merged Changes

3062b78db582 (PUP-2298) Use resource specific log_exception
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
da800647c29e (PUP-2298) protect transaction spec test against new exceptions
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
3041c2cdee4b (PUP-2298) add resource lifecycle method Puppet::Type#pre_run_check
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

lib/

puppet/

spec/

integration/

transaction_spec.rb

type/

unit/

transaction_spec.rb

rPUe430a8bf5c57

lib/puppet/transaction.rb

Loading...

lib/puppet/type.rb

Loading...

spec/integration/transaction_spec.rb

Loading...

spec/integration/type/tidy_spec.rb

Loading...

spec/unit/transaction_spec.rb

Loading...