diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-28 13:30:54 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-28 13:31:07 -0800 |
| commit | 721ace5007eb670651acb3b49f3e5b84a1a4f15c (patch) | |
| tree | 95de42dd013b16a2cf5bd42bdcb0b38457d6a665 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | a0abd8d5db6a756a585259467db5547d193de238 (diff) | |
| parent | ecb953646b2defbab3bbc53a58ce7ba98d560b50 (diff) | |
| download | puppet-721ace5007eb670651acb3b49f3e5b84a1a4f15c.tar.gz puppet-721ace5007eb670651acb3b49f3e5b84a1a4f15c.tar.xz puppet-721ace5007eb670651acb3b49f3e5b84a1a4f15c.zip | |
Merge branch 'ticket/2.6.next/4914' into 2.6.next
* ticket/2.6.next/4914:
Revert "(#6309) Ensure the correct device is mounted when managing mounts"
(#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
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions