diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-27 13:27:40 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-27 13:27:40 -0700 |
| commit | 68c82d4d8b75ebd8f0ab61b37ba78cf5fbc52081 (patch) | |
| tree | d3f136373e6a10819975fa1ec0a931c1eb4afb37 /lib/puppet/rails/rails_resource.rb | |
| parent | 32b13dad06195b37f0e10d13c6d2a9d958be00a7 (diff) | |
| parent | 1b12b55b6a2d3581f9643bf09d55727ba1213580 (diff) | |
| download | puppet-68c82d4d8b75ebd8f0ab61b37ba78cf5fbc52081.tar.gz puppet-68c82d4d8b75ebd8f0ab61b37ba78cf5fbc52081.tar.xz puppet-68c82d4d8b75ebd8f0ab61b37ba78cf5fbc52081.zip | |
Merge branch '2.7.next' into next
* 2.7.next:
(#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
(#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