Fixed #6681 - Remove --force-yes option from aptitude is used
vim: Initial ftplugin and indent support

Vim's indent support makes it easier to automatically indent puppet
manifests.
(#6856) Copy dangling symlinks with 'links => manage' File resource.

When copying symlinks with 'links => manage', there is no need to
examine the content of the link target, since the link is supposed to be
copied as-is.  Skip copying this value to the resource from the metadata
(source), since the content will be nil in the dangling symlink case.

Paired-with: Jacob Helwig
Merge branch 'ticket/2.6.next/6856-dangling-symlinks' into 2.6.next

* ticket/2.6.next/6856-dangling-symlinks:
  (#6856) Copy dangling symlinks with 'links => manage' File resource.
(#6818) Stop from getting Rails 3 named_scope deprecation warning

We want our Rails models in Puppet to work under Rails 2 or 3, but we
don't want the deprecation warnings since we can't control what version
of Rails the client is running.

DEPRECATION WARNING: Base.named_scope has been deprecated, please use
Base.scope instead

Reviewed-by: Nick Lewis <nick@puppetlabs.com>
Merge branch 'ticket/2.6.next/6818-named_scope_deprecation' into 2.6.next

* ticket/2.6.next/6818-named_scope_deprecation:
  (#6818) Stop from getting Rails 3 named_scope deprecation warning
maint: Fix sporadic sqlite error

ActiveRecord::StatementInvalid: SQLite3::IOException: disk I/O error

This happened if you ran these tests in the following order since Rails
wasn't disconnecting between tests.

rspec spec/unit/indirector/facts/inventory_active_record_spec.rb
spec/unit/indirector/node/active_record_spec.rb

Paired-with: Nick Lewis <nick@puppetlabs.com>
maint: Fix sqlite3 require to really be optional

You need to specifically rescue LoadError if you want requires to be
optional.

Paired-with: Nick Lewis
Merge branch 'ticket/2.6.next/maint-fix_sqlite_test' into 2.6.next

* ticket/2.6.next/maint-fix_sqlite_test:
  maint: Fix sqlite3 require to really be optional
  maint: Fix sporadic sqlite error
(#7018) explain internals better in service provider documentation

Add explicit reasoning for hasstatus in the documentation with certain
"virtual" services.

Just to clear up why notify => Service["something_virtual"] requires
hasstatus defining for it to function.
(#7018) Give more context on the service type's assumptions. Wording tweaks.

Refactoring the @doc string for clarity.
Merge branch 'ticket/2.6.next/7018-clarify_service_type_behavior' into 2.6.next
Fixed #7082 - Added system support for groups
(#2331) Remove darwinports pkg provider, replace with rewritten macports provider

  * Employs port -q installed, much faster than port list installed
  * Handles upgrades correctly now
  * Makes use of internal port revision for ensure => latest upgrades
  * Versionable, now works with ensure => specified_version
  * Does not handle port variants at all yet.
  * Does not allow manual specification of revision, only version
  * Test coverage expanded using newer syntax

Paired-With: Daniel Pittman
Merge branch 'tickets/2.6.x/2331-macports-provider' into 2.6.next
Merge branch 'ticket/2.6.x/7082' into 2.6.next
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.
Updated CHANGELOG for 2.6.8rc1
Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next

* james/tickets/2.6.x/6681:
  Fixed #6681 - Remove --force-yes option from aptitude is used
(#4655) Allow stage to be set using a default class parameter

For example:
  stage{ pre: before => Stage[main] }
  class someclass ($stage=pre ) { ... }
  class { someclass: }

This transplants adding the edge from the resource to the stage from
the compiler into when the resource is evaluated.  This moves adding
the stage edges to after when the defaults are copied into the
resources, making them available.

Paired-with: Jesse Wolfe <jesse@puppetlabs.com>