HomePhorge

Merge branch '2.7.x'
da4a2def4263Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
lib/puppet/feature/base.rb
lib/puppet/file_serving/configuration.rb
spec/unit/indirector/ssl_file_spec.rb
spec/unit/parser/functions/extlookup_spec.rb
spec/unit/resource/catalog_spec.rb
test/language/ast/variable.rb

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPUda4a2def4263: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Aug 25 2011, 12:42 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.