Merge branch 'main' of github.com:tmanninger/puppetlabs-docker

Author: tmanninger

manifests/init.pp

@@ -470,6 +470,10 @@
   Boolean                                 $acknowledge_unsupported_os           = false,
   Integer                                 $run_systemd_start_limit_interval_sec = $docker::params::run_systemd_start_limit_interval_sec,
   Integer                                 $run_systemd_start_limit_burst        = $docker::params::run_systemd_start_limit_burst,
+<<<<<<< HEAD
+=======
+
+>>>>>>> c436feeba7f444fe90eb09a2459cfcd4b666b415
   # Windows specific parameters
   Optional[String]                        $docker_msft_provider_version         = $docker::params::docker_msft_provider_version,
   Optional[String]                        $nuget_package_provider_version       = $docker::params::nuget_package_provider_version,

manifests/params.pp

@@ -13,6 +13,10 @@
   $docker_ee_start_command              = 'dockerd'
   $docker_ee_source_location            = undef
   $docker_ee_key_source                 = undef
+<<<<<<< HEAD
+=======
+  $docker_ee_key_id                     = undef
+>>>>>>> c436feeba7f444fe90eb09a2459cfcd4b666b415
   $docker_ee_repos                      = stable
   $tcp_bind                             = undef
   $tls_enable                           = false