diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-27 13:25:35 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-27 13:25:35 -0700 |
| commit | 1b12b55b6a2d3581f9643bf09d55727ba1213580 (patch) | |
| tree | 9b264a5c82bea7fae868467166e1c647b72d5a53 /lib/puppet/interface/documentation.rb | |
| parent | ced9f553772d6fb786e620fada1c23427bd269bf (diff) | |
| parent | 361d6a3a6917fd9515a2180590fb671024132da7 (diff) | |
| download | puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.tar.gz puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.tar.xz puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.zip | |
Merge branch '2.6.next' into 2.7.next
* 2.6.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
(#6487) Add some testing for OS X version support in DirectoryService provider
(#6487) Directoryservice provider will fail in future OS releases
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions