diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-28 13:13:52 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-28 13:13:52 -0800 |
| commit | ecb953646b2defbab3bbc53a58ce7ba98d560b50 (patch) | |
| tree | c86769e10eade8ffb7bcc6e94299416ac2e709f7 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | a949a83c4f100be0254fadcb915f418f73705861 (diff) | |
| parent | 23a510a321e47a98768dc47f95cfa0bd8c1a314c (diff) | |
| download | puppet-ecb953646b2defbab3bbc53a58ce7ba98d560b50.tar.gz puppet-ecb953646b2defbab3bbc53a58ce7ba98d560b50.tar.xz puppet-ecb953646b2defbab3bbc53a58ce7ba98d560b50.zip | |
Merge branch 'ticket/2.6.x/4914' into maint/2.6.next/revert-6309
* ticket/2.6.x/4914:
(#4914) Improved stubbing in mount/parsed_spec tests.
(#4914) Improved parsed_spec for mount
(#4914) Remove mount specs
(#4914) Specs for mounted? match new behaviour
(#4914) Add specs for modified mount provider
(#4914) Add specs for modified mount type
(#4914) Update property blocks
(#4914) Query property_hash for mountstate
(#4914) Prefetch mountstate
(#4914) Join lines for better readability
Conflicts:
lib/puppet/provider/mount.rb
lib/puppet/provider/mount/parsed.rb
spec/unit/provider/mount/parsed_spec.rb
spec/unit/provider/mount_spec.rb
spec/unit/type/mount_spec.rb
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions