diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-14 16:27:45 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-14 16:27:45 -0700 |
| commit | a889d563026df8ffb8b6fb8e48804f2171485997 (patch) | |
| tree | d38490dc44f4b82589795e314212c16a1253e957 | |
| parent | f2f208e7ecdabf38de1c2296d22ff1bfeaa9887c (diff) | |
| parent | 208ece263dd360667bc833a31409cc97a4b71c89 (diff) | |
| download | chef-zero-a889d563026df8ffb8b6fb8e48804f2171485997.tar.gz | |
Merge pull request #214 from chef/jk/merge_more_better
Actually merge key data in user PUT response
| -rw-r--r-- | lib/chef_zero/endpoints/actors_endpoint.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |