summaryrefslogtreecommitdiff
path: root/lib/chef/node
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-23 11:07:05 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-02-23 11:07:05 -0800
commit87079d5014b331da6d55125a2d91c283c395a038 (patch)
tree9e15a2a7a7b66dee5fd5cb2f765b779c780c698e /lib/chef/node
parente9ec5679a629d304d3e23f880540f74dcb602cb8 (diff)
downloadchef-87079d5014b331da6d55125a2d91c283c395a038.tar.gz
Revert "fix node assignment of ImmutableArrays to VividMashes/AttrArrays"
This reverts commit e56f8d58b80334256085907961aac9ca9f56f125.
Diffstat (limited to 'lib/chef/node')
-rw-r--r--lib/chef/node/attribute_collections.rb2
-rw-r--r--lib/chef/node/mixin/state_tracking.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb
index 0271febea5..6922bcf200 100644
--- a/lib/chef/node/attribute_collections.rb
+++ b/lib/chef/node/attribute_collections.rb
@@ -92,7 +92,6 @@ class Chef
private
def convert_value(value)
- value.ensure_generated_cache! if value.respond_to?(:ensure_generated_cache!)
case value
when VividMash
value
@@ -190,7 +189,6 @@ class Chef
# AttrArray for consistency and to ensure that the added parts of the
# attribute tree will have the correct cache invalidation behavior.
def convert_value(value)
- value.ensure_generated_cache! if value.respond_to?(:ensure_generated_cache!)
case value
when VividMash
value
diff --git a/lib/chef/node/mixin/state_tracking.rb b/lib/chef/node/mixin/state_tracking.rb
index 0c3d4c33a4..690d261df6 100644
--- a/lib/chef/node/mixin/state_tracking.rb
+++ b/lib/chef/node/mixin/state_tracking.rb
@@ -1,5 +1,5 @@
#--
-# Copyright:: Copyright 2016-2018, Chef Software Inc.
+# Copyright:: Copyright 2016-2017, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");