From 208ece263dd360667bc833a31409cc97a4b71c89 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Thu, 14 Apr 2016 16:19:32 -0700 Subject: Actually merge key data in user PUT response --- lib/chef_zero/endpoints/actors_endpoint.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef_zero/endpoints/actors_endpoint.rb b/lib/chef_zero/endpoints/actors_endpoint.rb index cc02246..d1e4714 100644 --- a/lib/chef_zero/endpoints/actors_endpoint.rb +++ b/lib/chef_zero/endpoints/actors_endpoint.rb @@ -65,7 +65,7 @@ module ChefZero response = if request.api_v0? - user_data.merge(key_data) + user_data.merge!(key_data) elsif skip_key_create && !public_key user_data else -- cgit v1.2.1