diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 17:18:22 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 18:01:31 -0700 |
| commit | 376e0f04af01810d00eede4de52744bb8c8e1681 (patch) | |
| tree | 4723aa8e5667a664dffa2f3cd10832d9b511b604 /ext | |
| parent | 4922409a2bdf3ad6a094762c9e2e60371ed16a1b (diff) | |
| parent | b1a506c7dec849415073e1bf4b3c92f3c898d6d9 (diff) | |
| download | puppet-376e0f04af01810d00eede4de52744bb8c8e1681.tar.gz puppet-376e0f04af01810d00eede4de52744bb8c8e1681.tar.xz puppet-376e0f04af01810d00eede4de52744bb8c8e1681.zip | |
Merge branch '2.6.x' into 2.7.x
Conflicts:
acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb
lib/puppet/application/apply.rb
lib/puppet/configurer.rb
lib/puppet/configurer/fact_handler.rb
spec/unit/application/apply_spec.rb
spec/unit/configurer/fact_handler_spec.rb
spec/unit/configurer_spec.rb
Diffstat (limited to 'ext')
0 files changed, 0 insertions, 0 deletions