HomePhorge

Merge branch 'maint/2.7.x/resource_app_cleanup' into 2.7.x
24d6c518e167Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'maint/2.7.x/resource_app_cleanup' into 2.7.x

  • maint/2.7.x/resource_app_cleanup: (#9838) Return the tranaction report when doing a ral save (#9837) Split parameter pruning from manifest formatting (#9837) Move resource formatting method to Puppet::Resource (#9837) Move properties in prep to move proc to method (#9837) Make a clearer variable name in the specs (#9837) Call puppet apply to avoid deprecation warning (#9837) Extract methods from the main section of the resource application (#9837) Start the cleanup of the puppet resource application

Conflicts (resolved manually):
lib/puppet/application/resource.rb

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU24d6c518e167: Merge branch 'maint/2.7.x/resource_app_cleanup' into 2.7.x (authored by Max Martin <max@puppetlabs.com>).Oct 3 2011, 8:06 PM