deleted the last end accidentally

whitepages · Nov 21, 2014 · 3f4d867 · 3f4d867
1 parent 37ef51f
commit 3f4d867
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb
@@ -422,7 +422,9 @@ def force_override!(opts={})
        #
 
        def merged_attributes(*path)
-         immutablize(merge_all(path))
+        # immutablize(
+           merge_all(path)
+        # )
        end
 
        def combined_override(*path)
@@ -543,7 +545,7 @@ def merge_all(path)
            safe_dup(component)
          end
 
-         components.inject(nil) do |merged, component|
+         components.inject(ImmutableMash.new) do |merged, component|
            Chef::Mixin::DeepMerge.hash_only_merge!(merged, component)
          end
        end

diff --git a/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb
@@ -188,3 +188,4 @@ def fetch_role(name, included_by)
     end
 
   end
+end