diff options
| author | Adam Jacob <adam@hjksolutions.com> | 2009-03-06 00:13:39 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@hjksolutions.com> | 2009-03-06 00:13:39 -0800 |
| commit | 765aaca098575f413168833468ba62864ee595cf (patch) | |
| tree | 71af2be2485dddf4e6995e8a5460f0b0ccb9dd61 /NOTICE | |
| parent | d0af93d04222d19000782c803972234ff1b4220f (diff) | |
| parent | 5bb2941c5dfac95f016a56a056a712dbe09095ab (diff) | |
| download | chef-765aaca098575f413168833468ba62864ee595cf.tar.gz | |
Merge branch 'master' into skeptomai/chef-54a
Conflicts:
NOTICE
chef-server/NOTICE
chef-server/Rakefile
chef-server/lib/init.rb
chef/bin/chef-client
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,7 +11,8 @@ Contributors and Copyright holders: * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com> * Copyright 2009, Sean Cribbs <seancribbs@gmail.com> * Copyright 2009, Christopher Brown <cb@opscode.com> - + * Copyright 2009, Thom May <thom@clearairturbulence.org> + 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. |