diff options
| -rw-r--r-- | NOTICE | 2 | ||||
| -rw-r--r-- | chef/lib/chef/mixin/deep_merge.rb | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -17,3 +17,5 @@ Contributors and Copyright holders: Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard. Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard. + +Chef incorporates code modified from deep_merge (http://trac.misuse.org/science/wiki/DeepMerge), which is Copyright (c) 2008 Steve Midgley diff --git a/chef/lib/chef/mixin/deep_merge.rb b/chef/lib/chef/mixin/deep_merge.rb index 11a3fa3353..c8a3b2c6c6 100644 --- a/chef/lib/chef/mixin/deep_merge.rb +++ b/chef/lib/chef/mixin/deep_merge.rb @@ -17,10 +17,9 @@ # See the License for the specific language governing permissions and # limitations under the License. - -#TODO: 1) Is adding the original author (Steve Midgley) to the Author and Copyright sections at the top of this file -# the correct way to handle the import of his code? -# 2) What about his lack of a public email address? +# Notice: +# This code is imported from deep_merge by Steve Midgley. deep_merge is available under the MIT license +# from http://trac.misuse.org/science/wiki/DeepMerge class Chef module Mixin |