diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:30:51 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:30:51 -0800 |
| commit | 480c399f183627f5f588e9dc9f5f86f683c0e468 (patch) | |
| tree | cb67d36e37e252edceef1cd848cc32d679f5d20e /spec/unit/resource | |
| parent | 73397a24db7e715c7712def75612dc4a5071ca7f (diff) | |
| parent | 52ca8c78c270b93ce997217900a3d333ad8154cc (diff) | |
| download | puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.tar.gz puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.tar.xz puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.zip | |
Merge branch '2.6.x' into next
Manually Resolved Conflicts:
lib/puppet/resource/type_collection.rb
spec/unit/configurer_spec.rb
spec/unit/indirector/catalog/active_record_spec.rb
spec/unit/resource/type_collection_spec.rb
spec/unit/transaction/resource_harness_spec.rb
Diffstat (limited to 'spec/unit/resource')
0 files changed, 0 insertions, 0 deletions