diff options
author | Max Martin <max@puppetlabs.com> | 2011-04-21 19:04:39 -0700 |
---|---|---|
committer | Max Martin <max@puppetlabs.com> | 2011-04-21 19:04:39 -0700 |
commit | 25593abbb044aca86c71cd60e91665eca0ce1bd1 (patch) | |
tree | d8703468b9b598c196348b748fbe47333b31a745 /lib/puppet/rails/rails_resource.rb | |
parent | 01f610bb223b435dc52f491260af3ea002930102 (diff) | |
parent | e4b31b411a4b3d7cce7f45197491eebc36d047aa (diff) | |
download | puppet-25593abbb044aca86c71cd60e91665eca0ce1bd1.tar.gz puppet-25593abbb044aca86c71cd60e91665eca0ce1bd1.tar.xz puppet-25593abbb044aca86c71cd60e91665eca0ce1bd1.zip |
Merge branch 'next'
* next:
(#6928) Don't blow up when the method is undefined...
(#6928) backport Symbol#to_proc for Ruby < 1.8.7
(#7183) Implement "invisible glob" version matching for faces
maint: better disabling of Signal#trap in our tests.
maint: more robust listing of valid faces.
maint: clean up testing code a fraction...
maint: better error report for a missing version of a face.
maint: handle face clear/reset sanely in the interface spec.
maint: stop stubbing log level setting.
Move tests from Puppet-acceptance repo
(#7116) Handle application-level options in parse_options
maint: fix gratuitous whitespace in the code.
maint: remove redundant context from the test.
(#7062) better argument handling in the action wrapper methods
maint: move method comments outside the comment.
Fixed #7166 - Replaced deprecated stomp "send" method with "publish"
maint: Remove unused faces code
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions