diff options
| -rw-r--r-- | NOTICE | 2 | ||||
| -rw-r--r-- | lib/chef/util/diff.rb | 25 |
2 files changed, 27 insertions, 0 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 deep_merge (http://trac.misuse.org/science/wiki/DeepMerge), which is Copyright (c) 2008 Steve Midgley + +Ohai incorporates code modified from diff-lcs (http://diff-lcs.rubyforge.org/), which is Copyright (c) 2004–2013 Austin Ziegler diff --git a/lib/chef/util/diff.rb b/lib/chef/util/diff.rb index cb68ff47dd..33ec6ef857 100644 --- a/lib/chef/util/diff.rb +++ b/lib/chef/util/diff.rb @@ -14,6 +14,31 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Some portions of this file are derived from material in the diff-lcs +# project licensed under the terms of the MIT license, provided below. +# +# Copyright:: Copyright (c) 2004-2013 Austin Ziegler +# License:: MIT +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of this Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN THE +# SOFTWARE. require 'diff/lcs' require 'diff/lcs/hunk' |