diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-13 16:52:20 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-13 16:52:20 -0700 |
| commit | d9d9709c1eac46a94160dd75de34eafeb6c6de0c (patch) | |
| tree | d86a85e406a70f6dc062af0d823d7ed1bfa5695b /lib/puppet/interface/documentation.rb | |
| parent | da4457be4dedaed5368bacf81a08f0429e21cd45 (diff) | |
| parent | 6a8068b3912d6275efe4005258a06d03363c8944 (diff) | |
| download | puppet-d9d9709c1eac46a94160dd75de34eafeb6c6de0c.tar.gz puppet-d9d9709c1eac46a94160dd75de34eafeb6c6de0c.tar.xz puppet-d9d9709c1eac46a94160dd75de34eafeb6c6de0c.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
(#2331) Remove darwinports pkg provider, replace with rewritten macports provider
Fixed #7082 - Added system support for groups
(#7018) Give more context on the service type's assumptions. Wording tweaks.
(#7018) explain internals better in service provider documentation
maint: Fix sqlite3 require to really be optional
maint: Fix sporadic sqlite error
(#6818) Stop from getting Rails 3 named_scope deprecation warning
(#6856) Copy dangling symlinks with 'links => manage' File resource.
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions