diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-15 11:25:01 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-15 11:25:01 -0700 |
| commit | a6d0e99e97d18b622793a807e985580cb65a8c7c (patch) | |
| tree | 3ff2d3244116fadb2c048e74a6254f90f68ad168 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 5d3aa54d86a7b9a2c089b2dbff0778d928853666 (diff) | |
| parent | 4c1929952e7239f14aa1ab6a317d445a05d770c3 (diff) | |
| download | puppet-a6d0e99e97d18b622793a807e985580cb65a8c7c.tar.gz puppet-a6d0e99e97d18b622793a807e985580cb65a8c7c.tar.xz puppet-a6d0e99e97d18b622793a807e985580cb65a8c7c.zip | |
Merge branch 'ticket/2.6.next/5428-handle-0.25.x-storedconfig-data' into 2.6.next
* ticket/2.6.next/5428-handle-0.25.x-storedconfig-data:
Remove extra trailing whitespace from lib/puppet/resource.rb
(#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
Conflicts:
lib/puppet/resource.rb
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions