diff options
| -rw-r--r-- | ext/logcheck/puppet | 2 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/provider/package/pkgdmg.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/logcheck/puppet b/ext/logcheck/puppet index ab617e754..8b854dc48 100644 --- a/ext/logcheck/puppet +++ b/ext/logcheck/puppet @@ -13,3 +13,5 @@ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Caught (TERM|INT); shutting down$ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Shutting down$ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Restarting with .*$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting catalog run$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Finished catalog run in [.0-9]+ seconds$ diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index a767d2952..a95023895 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -305,7 +305,7 @@ module Puppet :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppetmasterd."], :code => ["", "Code to parse directly. This is essentially only used - by ``puppet`, and should only be set if you're writing your own Puppet + by ``puppet``, and should only be set if you're writing your own Puppet executable"], :masterlog => { :default => "$logdir/puppetmaster.log", :owner => "$user", diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index b7601cde9..2020b6b56 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -87,10 +87,8 @@ Example usage:: **WARNING**: Because I assume files will be downloaded to /tmp, the current implementation attempts to delete DMG files if you install directly from the -file system and not via a URL method. -" +file system and not via a URL method." - confine :exists => "/Library/Receipts" commands :installer => "/usr/sbin/installer" commands :hdiutil => "/usr/bin/hdiutil" |