diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-27 13:28:22 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-27 13:28:22 -0700 |
| commit | 7f9c9e1089c4bc36d52fcdd9751de559c658bf8d (patch) | |
| tree | d3f136373e6a10819975fa1ec0a931c1eb4afb37 /lib/puppet/rails/rails_resource.rb | |
| parent | a80ff1ad0d25cc7cfa98cd6f425e6230787950fb (diff) | |
| parent | 68c82d4d8b75ebd8f0ab61b37ba78cf5fbc52081 (diff) | |
| download | puppet-7f9c9e1089c4bc36d52fcdd9751de559c658bf8d.tar.gz puppet-7f9c9e1089c4bc36d52fcdd9751de559c658bf8d.tar.xz puppet-7f9c9e1089c4bc36d52fcdd9751de559c658bf8d.zip | |
Merge branch 'next'
* next:
(#7101) Fix template error messages in Ruby 1.8.5
(#3420) Nagios "name" attribute does not output correctly
(#4487) When setting environment on a host, ensure it is a string.
add test for ticket 7101
add test for ticket 7101
(#7220) Add the ability to "inherit" options.
(#6487) Add some testing for OS X version support in DirectoryService provider
(#6487) Directoryservice provider will fail in future OS releases
(#6368) Make the File type autorequire its nearest ancestor directory
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions