diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-13 17:20:24 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-13 17:20:24 -0700 |
| commit | 3ab44c7ce01ab86a995deb66228f5be95239c92a (patch) | |
| tree | 90520cf62bfa2f1bb9c992bbfe1bc47ae10471f2 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 7817ccb3438ad2742a98694373e42b65df86eda7 (diff) | |
| parent | bee1ef73e5c83541edcf1249f062ba832618da48 (diff) | |
| download | puppet-3ab44c7ce01ab86a995deb66228f5be95239c92a.tar.gz puppet-3ab44c7ce01ab86a995deb66228f5be95239c92a.tar.xz puppet-3ab44c7ce01ab86a995deb66228f5be95239c92a.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
Updated CHANGELOG for 2.6.8rc1
(#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.
Conflicts (Resolved manually):
lib/puppet/type/group.rb
spec/unit/indirector/facts/inventory_active_record_spec.rb
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions