diff options
| author | Thom May <thom@may.lt> | 2016-03-04 10:10:02 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-03-04 10:10:02 +0000 |
| commit | 483af03cb2bad1dfdbedaabe63773eebad860ce2 (patch) | |
| tree | 85d850de59d8ceb4ab19a2a026d63599f37ec054 /lib/chef | |
| parent | 5759ef3960095f74f74d41f02870fe31c3793580 (diff) | |
| parent | fc6b85bfb043bf3b93f0828216bf722fbdcd8aed (diff) | |
| download | chef-483af03cb2bad1dfdbedaabe63773eebad860ce2.tar.gz | |
Merge pull request #4664 from chef/salam/databag-fix
Data bag item hash can have name key
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/data_bag_item.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb index 4d6e33ce1f..d9ad771202 100644 --- a/lib/chef/data_bag_item.rb +++ b/lib/chef/data_bag_item.rb @@ -128,7 +128,6 @@ class Chef def self.from_hash(h) h.delete("chef_type") h.delete("json_class") - h.delete("name") item = new item.data_bag(h.delete("data_bag")) if h.key?("data_bag") |