Faidon Liambotis has submitted this change and it was merged. Change subject: Fix various typos ......................................................................
Fix various typos Change-Id: I2aa6e65e4eac8b920bf39fb51089cfaea9b0956f --- M files/nfs/upstart-nfs-noidmap.conf M manifests/ganglia.pp M modules/toollabs/manifests/init.pp 3 files changed, 15 insertions(+), 16 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/nfs/upstart-nfs-noidmap.conf b/files/nfs/upstart-nfs-noidmap.conf index 61fb5cf..91dc558 100644 --- a/files/nfs/upstart-nfs-noidmap.conf +++ b/files/nfs/upstart-nfs-noidmap.conf @@ -1,10 +1,10 @@ # nfs-noidmap - disable idmap for cross-project NFS # -# This task disables the kernel's automatic idmap for NFSv4 -# to allow conflicting group names accross projects +# This task disables the kernel's automatic idmap for NFSv4 to allow +# conflicting group names across projects. # -# Made into an upstart task because that setting is annoyingly -# not made available through sysctl. +# Made into an upstart task because that setting is annoyingly not +# made available through sysctl. description "disable idmap for cross-project NFS" diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index 1a08f35..fa06976 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -574,27 +574,27 @@ } -# == Define ganlia::view +# == Define ganglia::view # Defines a Ganglia view JSON file. # See http://sourceforge.net/apps/trac/ganglia/wiki/ganglia-web-2#JSONdefinitionforviews # for documentation on Ganglia view JSON format. # # == Parameters: -# $graphs - Shortcut for of describing items that represent aggregate_graphs. +# $graphs - Shortcut for describing items that represent aggregate_graphs. # $items - Should match exactly the JSON structure expected by Ganglia for views. # $view_type - If you are using aggregate_graphs, this must be set to 'standard'. # 'regex' will allow you to use non-aggregate graphs and match hostnames by regex. # Default: 'standard'. # $default_size - Default size for graphs. Default: 'large'. # $conf_dir - Path to directory where ganglia view JSON files should live. -# Defaults to the appropriate directory based on WMF $::realm. Default: to /var/lib/ganglia/conf -# $template - The ERb template to use for the JSON file. Only change this if you need to do fancier things than this define allows. +# Defaults to the appropriate directory based on WMF $::realm. Default: /var/lib/ganglia/conf. +# $template - The ERB template to use for the JSON file. Only change this if you need to do fancier things than this define allows. # # == Examples: -# # A 'regex' (non aggregate graph) view: +# # A 'regex' (non-aggregate graph) view: # # Note that no aggregate_graphs are used. # # This will add 4 graphs to the 'cpu' view. -# # (i.e. cpu_user and cpu_system for each myhost and myhost1) +# # (i.e. cpu_user and cpu_system for each myhost0 and myhost1) # $host_regex = 'myhost[01]' # ganglia::view { 'cpu': # view_type => 'regex', @@ -662,10 +662,10 @@ # $plugins - the plugin name (ex: 'diskstat'), will install the Python file # located in files/ganglia/plugins/${name}.py and expand the template from # templates/ganglia/plugins/${name}.pyconf.erb. -# Defaults to $title as a convenience +# Defaults to $title as a convenience. # -# $opts - optional hash which can be used in the template. The defaults are -# hardcoded in the templates. Default to {} +# $opts - optional hash which can be used in the template. The +# defaults are hardcoded in the templates. Defaults to {}. # # == Examples: # diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index a125e35..48190e5 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -74,7 +74,7 @@ # Tool Labs is enduser-facing, so we want to control the motd # properly (most things make no sense for community users: they # don't care that packages need updating, or that filesystems - # will be checked, for instance) + # will be checked, for instance). file { '/etc/update-motd.d': ensure => directory, @@ -86,7 +86,7 @@ purge => true, } - # We keep a project-locat apt repo where we stuff packages we build + # We keep a project-local apt repo where we stuff packages we build # that are intended to be local to the project. By keeping it on the # shared storage, we have no need to set up a server to use it. @@ -126,4 +126,3 @@ target => "${store}/mail", } } - -- To view, visit https://gerrit.wikimedia.org/r/107165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2aa6e65e4eac8b920bf39fb51089cfaea9b0956f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: coren <mpellet...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
