From 13b61888c8db020811e8628f7bfc26ade7c12a30 Mon Sep 17 00:00:00 2001
From: Emmanuel Guerin <dev@emmanuelguerin.fr>
Date: Wed, 1 Mar 2017 17:13:50 +0100
Subject: [PATCH] Fix #570: JNLP Windows slaves broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since action DSL is now used in the slave providers,
we can’t rely on inheritance anymore.
---
 libraries/slave_jnlp.rb    | 4 ++--
 libraries/slave_windows.rb | 7 ++-----
 metadata.rb                | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libraries/slave_jnlp.rb b/libraries/slave_jnlp.rb
index 0eba4c0c52..0604cc20b7 100644
--- a/libraries/slave_jnlp.rb
+++ b/libraries/slave_jnlp.rb
@@ -50,8 +50,8 @@ def load_current_resource
       super
     end
 
-    action :create do
-      do_create
+    def do_create
+      super
 
       parent_remote_fs_dir_resource.run_action(:create)
 
diff --git a/libraries/slave_windows.rb b/libraries/slave_windows.rb
index f1852c41c6..9c41cd78f8 100644
--- a/libraries/slave_windows.rb
+++ b/libraries/slave_windows.rb
@@ -63,11 +63,8 @@ def load_current_resource
       super
     end
 
-    #
-    # @see Chef::Resource::JenkinsSlave#action_create
-    #
-    action :create do
-      do_create
+    def do_create
+      super
 
       # The following resources are created in the parent:
       #
diff --git a/metadata.rb b/metadata.rb
index 38d1b821df..6c1818fc4d 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures Jenkins CI master & slaves'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '4.2.1'
+version          '4.2.2'
 
 recipe 'jenkins::master', 'Installs a Jenkins master'