Merge pull request #935 from puppetlabs/CONT-1196-remove-deprecated-function

(CONT-1196) - Remove deprecated function merge

Author: jordanbreen28

manifests/install.pp

@@ -52,19 +52,19 @@
       }
       case $docker::package_source {
         /docker-engine/ : {
-          ensure_resource('package', 'docker', merge($docker_hash, {
+          ensure_resource('package', 'docker', stdlib::merge($docker_hash, {
                 ensure => $ensure,
                 source => $docker::package_source,
                 name   => $docker::docker_engine_package_name,
           }))
         }
         /docker-ce/ : {
-          ensure_resource('package', 'docker', merge($docker_hash, {
+          ensure_resource('package', 'docker', stdlib::merge($docker_hash, {
                 ensure => $ensure,
                 source => $docker::package_source,
                 name   => $docker::docker_ce_package_name,
           }))
-          ensure_resource('package', 'docker-ce-cli', merge($docker_hash, {
+          ensure_resource('package', 'docker-ce-cli', stdlib::merge($docker_hash, {
                 ensure => $ensure,
                 source => $docker::package_source,
                 name   => $docker::docker_ce_cli_package_name,
@@ -76,7 +76,7 @@
       }
     } else {
       if $facts['os']['family'] != 'windows' {
-        ensure_resource('package', 'docker', merge($docker_hash, {
+        ensure_resource('package', 'docker', stdlib::merge($docker_hash, {
               ensure => $ensure,
               name   => $docker::docker_package_name,
         }))