merge_options now defaults to true, so don't warn anymore

yakatz · yakatz · commit 1d87dafdd8c2 · 2023-11-20T14:02:11.000-05:00
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
@@ -48,7 +48,6 @@
     $_defaults_options = $haproxy::params::defaults_options + $defaults_options
   } else {
     $_defaults_options = $defaults_options
-    warning("${module_name}: The \$merge_options parameter will default to true in the next major release. Please review the documentation regarding the implications.") # lint:ignore:140chars
   }
 
   $parameters = {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@`
`48`	`48`	`$_defaults_options = $haproxy::params::defaults_options + $defaults_options`
`49`	`49`	`} else {`
`50`	`50`	`$_defaults_options = $defaults_options`
`51`		`- warning("${module_name}: The \$merge_options parameter will default to true in the next major release. Please review the documentation regarding the implications.") # lint:ignore:140chars`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`$parameters = {`