diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-02 01:09:29 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-02 01:09:29 -0700 |
| commit | c6e824ad5144957e351892a1d745a127b02f34b3 (patch) | |
| tree | 4eb34daf8242453c756911f507a1290ec7aebe67 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 2e189d5166430b9ed37d9289a746b73e8673cab6 (diff) | |
| parent | f95006148c3a0b4d7e8ee1812b1993b674f050e4 (diff) | |
| download | puppet-c6e824ad5144957e351892a1d745a127b02f34b3.tar.gz puppet-c6e824ad5144957e351892a1d745a127b02f34b3.tar.xz puppet-c6e824ad5144957e351892a1d745a127b02f34b3.zip | |
Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next
Some specs were in conflict, as they had been recently modified to use
the API functionality that f950061 removes. This merge commit simply
restores the verson of those specs from f950061.
Manually Resolved Conflicts:
spec/unit/dsl/resource_type_api_spec.rb
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions