Merge pull request #1140 from puppetlabs/binford2k-patch-1

david22swan · web-flow · commit 159d19726062 · 2018-11-01T13:50:22.000Z
(DOCS) correcting the function name in the docstring
diff --git a/lib/puppet/functions/mysql/deepmerge.rb b/lib/puppet/functions/mysql/deepmerge.rb
@@ -3,7 +3,7 @@
 # @example
 #   $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
 #   $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-#   $merged_hash = mysql_deepmerge($hash1, $hash2)
+#   $merged_hash = mysql::deepmerge($hash1, $hash2)
 #   # The resulting hash is equivalent to:
 #   # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }
 #

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# @example`
`4`	`4`	`# $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }`
`5`	`5`	`# $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }`
`6`		`-# $merged_hash = mysql_deepmerge($hash1, $hash2)`
	`6`	`+# $merged_hash = mysql::deepmerge($hash1, $hash2)`
`7`	`7`	`# # The resulting hash is equivalent to:`
`8`	`8`	`# # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }`
`9`	`9`	`#`