HomePhorge

Merge branch '2.6.x' into next
3ab44c7ce01aUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

Details

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU3ab44c7ce01a: Merge branch '2.6.x' into next (authored by Max Martin <max@puppetlabs.com>).Apr 14 2011, 2:20 AM

Merged Changes