LICENSE in knife-spork-1.7.2 vs LICENSE in knife-spork-1.7.3

- old
+ new

@@ -1,35 +1,35 @@ -KnifeSpork ----------- -Author:: Jon Cowie (<jonlives@gmail.com>) -Copyright:: Copyright (c) 2011 Jon Cowie -License:: GPL - -Plugin API ----------- -Author:: Seth Vargo (<svargo@customink.com>) -Copyright:: Copyright (c) 2012 Seth Vargo -License:: GPL - -Other ------ -spork bump is based on the knife-cookbook-bump plugin by: -Alalanta (no license specified) - -With snippets from: -Author:: Adam Jacob (<adam@opscode.com>) -Author:: Christopher Walters (<cw@opscode.com>) -Author:: Nuo Yan (<yan.nuo@gmail.com>) -Copyright:: Copyright (c) 2009, 2010 Opscode, Inc. -License:: Apache License, Version 2.0 - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +KnifeSpork +---------- +Author:: Jon Cowie (<jonlives@gmail.com>) +Copyright:: Copyright (c) 2011 Jon Cowie +License:: GPL + +Plugin API +---------- +Author:: Seth Vargo (<svargo@customink.com>) +Copyright:: Copyright (c) 2012 Seth Vargo +License:: GPL + +Other +----- +spork bump is based on the knife-cookbook-bump plugin by: +Alalanta (no license specified) + +With snippets from: +Author:: Adam Jacob (<adam@opscode.com>) +Author:: Christopher Walters (<cw@opscode.com>) +Author:: Nuo Yan (<yan.nuo@gmail.com>) +Copyright:: Copyright (c) 2009, 2010 Opscode, Inc. +License:: Apache License, Version 2.0 + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.