summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/rdoc/code_objects.rb
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-01-06 15:33:56 -0800
committerMatt Robinson <matt@puppetlabs.com>2011-01-06 15:33:56 -0800
commitdbfcefc53cbd0b33079aa85ef8ce3efce48643b9 (patch)
tree1d20926d351df1f30e9d301b72623dd1fc3cd065 /lib/puppet/util/rdoc/code_objects.rb
parent19eb1e78e115d10bfb822e510213e4fab9cd2599 (diff)
parent2d8884487159a29fa0a6b89379d5fc1b11c2652c (diff)
downloadpuppet-dbfcefc53cbd0b33079aa85ef8ce3efce48643b9.tar.gz
puppet-dbfcefc53cbd0b33079aa85ef8ce3efce48643b9.tar.xz
puppet-dbfcefc53cbd0b33079aa85ef8ce3efce48643b9.zip
Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.x
* maint/2.6.next/remove_rspec_options_from_rakefile: maint: Add vim swap files to .gitignore maint: Remove rspec options from the Rakefile
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions