diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-15 15:57:27 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-15 15:57:27 -0700 |
| commit | 9016662cc108dbcced5ad9c9a33f4ecd61cac178 (patch) | |
| tree | 221f791ff7516cb15e7254ca20e3f38dcf9f175a /lib/puppet/util/rdoc/code_objects.rb | |
| parent | c0712d367583c5a1a6c68cd469a5e42a90685f56 (diff) | |
| parent | a6d0e99e97d18b622793a807e985580cb65a8c7c (diff) | |
| download | puppet-9016662cc108dbcced5ad9c9a33f4ecd61cac178.tar.gz puppet-9016662cc108dbcced5ad9c9a33f4ecd61cac178.tar.xz puppet-9016662cc108dbcced5ad9c9a33f4ecd61cac178.zip | |
Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.next
* '2.6.next' of github.com:puppetlabs/puppet:
(#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
Remove extra trailing whitespace from lib/puppet/resource.rb
(#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
(#6707) Fix typo in rest_authconfig.rb
(#6689) Make inventory_active_record terminus search quickly
(#5662) Fixed tests that didnt stub key_attributes
(#5662) Parsedfile doesnt work with mult keyattr
(#5661) Creating types dont work with >1 namevar
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions