diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-18 14:41:30 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-18 14:41:30 -0700 |
| commit | 7e71840e29cb09c772668a51ada3cab1e319e50f (patch) | |
| tree | 9b0c15f2c93fa6c60364bd78dcbe17a40b740a23 /lib/puppet/reference | |
| parent | ea348761df0b5297dbac50c7f1c48d22746524fa (diff) | |
| parent | 2ae88067492f7922a3c4d53b6fa8c849b193f76a (diff) | |
Merge branch 'next'
* next: (198 commits)
(#6722) load all functions before testing...
Updated CHANGELOG for 2.6.7rc1
(#5073) Download plugins even if you're filtering on tags
Fix #5610: Prevent unnecessary RAL lookups
Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
(#6723) Fix withenv environment restoration bug
(#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
(#5479) Test that we auto-require the zone dataset.
(#5479) Autorequire zfs filesystem when zone dataset is configured
(#5392) Give a better error when realizing a non-existant resource
(#2645) Adding a less-stubby test to verify the "system" attribute's behavior
Update CHANGELOG for 2.6.6
maint: Remove serialization of InventoryFact values
maint: Rename InventoryHost to InventoryNode
(#6441) Add mount fixture for AIX's /etc/filesystems
Fixed #2645 - Added support for creating system users
...
Diffstat (limited to 'lib/puppet/reference')
| -rw-r--r-- | lib/puppet/reference/configuration.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/reference/metaparameter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index c8ff145ba..6581427ff 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -122,7 +122,7 @@ likewise be redirected to a file: Puppet can also create user and group accounts for itself (one `puppet` group and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument: - $ puppet agent --mkusers + $ puppet master --mkusers ## Signals diff --git a/lib/puppet/reference/metaparameter.rb b/lib/puppet/reference/metaparameter.rb index c16a1d33a..3c4c08701 100644 --- a/lib/puppet/reference/metaparameter.rb +++ b/lib/puppet/reference/metaparameter.rb @@ -29,7 +29,7 @@ in your manifest, including defined components. params.sort { |a,b| a.to_s <=> b.to_s }.each { |param| - str += paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)), :level => 4) + str += paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)), :level => 3) } rescue => detail puts detail.backtrace |