features/data/cookbooks/packages/recipes/gem_package.rb features/data/cookbooks/packages/recipes/install_gem_package_twice.rb features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb features/data/cookbooks/packages/recipes/upgrade_gem_package.rb features/data/gems/Marshal.4.8 features/data/gems/Marshal.4.8.Z features/data/gems/gems/chef-integration-test-0.1.0.gem features/data/gems/gems/chef-integration-test-0.1.1.gem features/data/gems/latest_specs.4.8 features/data/gems/latest_specs.4.8.gz features/data/gems/prerelease_specs.4.8 features/data/gems/prerelease_specs.4.8.gz features/data/gems/quick/Marshal.4.8/chef-integration-test-0.1.0.gemspec.rz features/data/gems/quick/Marshal.4.8/chef-integration-test-0.1.1.gemspec.rz features/data/gems/quick/chef-integration-test-0.1.0.gemspec.rz features/data/gems/quick/chef-integration-test-0.1.1.gemspec.rz features/data/gems/quick/index features/data/gems/quick/index.rz features/data/gems/quick/latest_index features/data/gems/quick/latest_index.rz features/data/gems/specs.4.8 features/data/gems/specs.4.8.gz features/data/gems/yaml features/data/gems/yaml.Z features/provider/package/gem_package.feature @@ -154,6 +154,10 @@ namespace :features do Cucumber::Rake::Task.new(:roles) do |t| t.profile = "client_roles" end + + Cucumber::Rake::Task.new(:run_interval) do |t| + t.profile = "client_run_interval" + end end Cucumber::Rake::Task.new(:search) do |t| @@ -191,6 +195,10 @@ namespace :features do Cucumber::Rake::Task.new(:macports) do |t| t.profile = "provider_package_macports" end + + Cucumber::Rake::Task.new(:gems) do |g| + g.profile = "provider_package_rubygems" + end end end end Rakefile @@ -9,7 +9,7 @@ rescue LoadError end GEM_NAME = "chef-server-slice" -CHEF_SERVER_VERSION="0.7.12" +CHEF_SERVER_VERSION="0.7.15" AUTHOR = "Opscode" EMAIL = "chef@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" chef-server-slice/Rakefile @@ -18,7 +18,7 @@ require 'chef' unless defined?(Chef) include FileUtils GEM = "chef-server" -CHEF_SERVER_VERSION = "0.7.12" +CHEF_SERVER_VERSION = "0.7.15" AUTHOR = "Opscode" EMAIL = "chef@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" chef-server/Rakefile @@ -4,7 +4,7 @@ require 'rake/rdoctask' require './tasks/rspec.rb' GEM = "chef" -CHEF_VERSION = "0.7.12" +CHEF_VERSION = "0.7.15" AUTHOR = "Adam Jacob" EMAIL = "adam@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" @@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.add_dependency "mixlib-config", ">= 1.0.12" - s.add_dependency "ohai", ">= 0.3.4" + s.add_dependency "ohai", ">= 0.3.6" %w{mixlib-cli mixlib-log ruby-openid json erubis extlib stomp}.each { |gem| s.add_dependency gem } chef/Rakefile @@ -27,7 +27,7 @@ require 'chef/config' Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib } class Chef - VERSION = '0.7.12' + VERSION = '0.7.15' end # Adds a Dir.glob to Ruby 1.8.5, for compat chef/lib/chef.rb @@ -74,6 +74,8 @@ class Chef ] file_list_str = file_list.keys.join("\n") + Chef::Log.debug("Searching for preferred file in\n#{file_list_str}") + preferences.each do |pref| Chef::Log.debug("Looking for #{pref}") matcher = /^(.+#{pref})$/ chef/lib/chef/mixin/find_preferred_file.rb @@ -129,7 +129,7 @@ class Chef status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr| crontab.each { |line| stdin.puts "#{line}" } - stdin.close + stdin.close rescue nil end Chef::Log.info("Updated cron '#{@new_resource.name}'") @new_resource.updated = true @@ -144,7 +144,7 @@ class Chef status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr| crontab.each { |line| stdin.puts "#{line}" } - stdin.close + stdin.close rescue nil end Chef::Log.info("Added cron '#{@new_resource.name}'") @new_resource.updated = true @@ -175,7 +175,7 @@ class Chef status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr| crontab.each { |line| stdin.puts "#{line}" } - stdin.close + stdin.close rescue nil end Chef::Log.debug("Deleted cron '#{@new_resource.name}'") @new_resource.updated = true chef/lib/chef/provider/cron.rb @@ -167,7 +167,7 @@ class Chef end def all_releases - Dir.glob(@new_resource.deploy_to + "/releases/*") + Dir.glob(@new_resource.deploy_to + "/releases/*").sort end def update_cached_repo chef/lib/chef/provider/deploy.rb @@ -39,11 +39,13 @@ class Chef clone checkout enable_submodules + @new_resource.updated = true end def action_export action_checkout FileUtils.rm_rf(::File.join(@new_resource.destination,".git")) + @new_resource.updated = true end def action_sync @@ -53,6 +55,8 @@ class Chef sync enable_submodules end + + @new_resource.updated = true end def find_current_revision @@ -191,4 +195,4 @@ class Chef end end -end \ No newline at end of file +end chef/lib/chef/provider/git.rb @@ -38,7 +38,7 @@ class Chef if( ::File.exists?(catdir) ) Dir.entries(catdir).each do |entry| - if(entry =~ /^#{Regexp.escape(pkg)}\-(.+)/) + if(entry =~ /^#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?)/) @current_resource.version($1) Chef::Log.debug("Got current version #{$1}") break chef/lib/chef/provider/package/portage.rb @@ -100,7 +100,7 @@ class Chef src = " --source=#{@new_resource.source} --source=http://gems.rubyforge.org" end run_command_with_systems_locale( - :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}" + :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}" ) end @@ -123,6 +123,12 @@ class Chef def purge_package(name, version) remove_package(name, version) end + + private + + def opts + expand_options(@new_resource.options) + end end end chef/lib/chef/provider/package/rubygems.rb @@ -34,6 +34,8 @@ import yum from yum import Errors +PIDFILE='/var/run/yum.pid' + # Seconds to wait for exclusive access to yum lock_timeout = 10 @@ -54,7 +56,7 @@ try: countdown = lock_timeout while True: try: - y.doLock() + y.doLock(PIDFILE) except Errors.LockError, e: time.sleep(1) countdown -= 1 @@ -80,7 +82,7 @@ try: # Ensure we clear the lock. finally: try: - y.doUnlock() + y.doUnlock(PIDFILE) # Keep Unlock from raising a second exception as it does with a yum.conf # config error. except Errors.YumBaseError: chef/lib/chef/provider/package/yum-dump.py @@ -70,7 +70,7 @@ class Chef end status = popen4(@node[:command][:ps]) do |pid, stdin, stdout, stderr| - stdin.close + stdin.close rescue nil r = Regexp.new(@new_resource.pattern) Chef::Log.debug("#{@new_resource}: attempting to match #{@new_resource.pattern} (#{r}) against process table") stdout.each_line do |line| chef/lib/chef/provider/service/freebsd.rb @@ -49,17 +49,15 @@ class Chef @current_resource.running false nil end - - else - Chef::Log.debug("#{@new_resource} does not support status and you have not specified a status command, falling back to process table inspection") + elsif + Chef::Log.warn "#{@new_resource}: falling back to process table inspection" if @node[:command][:ps].nil? or @node[:command][:ps].empty? - raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'ps' attribute" + raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'command.ps' attribute" end - status = popen4(@node[:command][:ps]) do |pid, stdin, stdout, stderr| - stdin.close + stdin.close rescue nil r = Regexp.new(@new_resource.pattern) - Chef::Log.debug("#{@new_resource}: attempting to match #{@new_resource.pattern} (#{r}) against process table") + Chef::Log.warn "#{@new_resource}: attempting to match '#{@new_resource.pattern}' (#{r}) against process list" stdout.each_line do |line| if r.match(line) @current_resource.running true @@ -71,7 +69,7 @@ class Chef unless status.exitstatus == 0 raise Chef::Exceptions::Service, "Command #{@node[:command][:ps]} failed" else - Chef::Log.debug("#{@new_resource}: #{@node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}") + Chef::Log.debug "#{@new_resource}: running: #{@current_resource.running}" end end chef/lib/chef/provider/service/simple.rb @@ -37,10 +37,12 @@ class Chef def action_checkout run_command(run_options(:command => checkout_command)) + @new_resource.updated = true end def action_export run_command(run_options(:command => export_command)) + @new_resource.updated = true end def action_sync @@ -49,6 +51,7 @@ class Chef else run_command(run_options(:command => sync_command)) end + @new_resource.updated = true end def sync_command chef/lib/chef/provider/subversion.rb @@ -256,7 +256,18 @@ class Chef include Chef::Mixin::ConvertToClassName def attribute(attr_name, validation_opts={}) - define_method(attr_name.to_sym) do |arg| + # This atrocity is the only way to support 1.8 and 1.9 at the same time + # When you're ready to drop 1.8 support, do this: + # define_method attr_name.to_sym do |arg=nil| + # etc. + shim_method=<<-SHIM + def #{attr_name}(arg=nil) + _set_or_return_#{attr_name}(arg) + end + SHIM + class_eval(shim_method) + + define_method("_set_or_return_#{attr_name.to_s}".to_sym) do |arg| set_or_return(attr_name.to_sym, arg, validation_opts) end end chef/lib/chef/resource.rb @@ -69,10 +69,9 @@ class Chef @remote = "origin" @enable_submodules = false @shallow_clone = false - @force_deploy = false @scm_provider = Chef::Provider::Git @provider = Chef::Provider::Deploy::Timestamped - @allowed_actions.push(:deploy, :rollback) + @allowed_actions.push(:force_deploy, :deploy, :rollback) end # where the checked out/cloned code goes @@ -244,15 +243,6 @@ class Chef ) end - # Shall we run the deploy even if the code has not changed? - def force_deploy(arg=nil) - set_or_return( - :force_deploy, - arg, - :kind_of => [ TrueClass, FalseClass ] - ) - end - def scm_provider(arg=nil) set_or_return( :scm_provider, @@ -357,4 +347,4 @@ class Chef end end -end \ No newline at end of file +end chef/lib/chef/resource/deploy.rb @@ -185,6 +185,8 @@ def create_cookbook(dir) sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" + sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" + sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "files", "default")}" sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "templates", "default")}" unless File.exists?(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb")) chef/lib/chef/tasks/chef_repo.rake @@ -79,18 +79,37 @@ describe Chef::Provider::Deploy do @provider.should_receive(:deploy) @provider.action_force_deploy end - - it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do - @provider.unstub!(:release_path) - all_releases = ["/my/deploy/dir/releases/20040815162342", "/my/deploy/dir/releases/20040700000000", - "/my/deploy/dir/releases/20040600000000", "/my/deploy/dir/releases/20040500000000"].sort! - Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases) - @provider.should_receive(:symlink) - FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342") - @provider.action_rollback - @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000") + + describe "on systems without broken Dir.glob results" do + it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do + @provider.unstub!(:release_path) + all_releases = [ "/my/deploy/dir/releases/20040815162342", + "/my/deploy/dir/releases/20040700000000", + "/my/deploy/dir/releases/20040600000000", + "/my/deploy/dir/releases/20040500000000"] + Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases) + @provider.should_receive(:symlink) + FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342") + @provider.action_rollback + @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000") + end end - + + describe "CHEF-628: on systems with broken Dir.glob results" do + it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do + @provider.unstub!(:release_path) + all_releases = [ "/my/deploy/dir/releases/20040500000000", + "/my/deploy/dir/releases/20040600000000", + "/my/deploy/dir/releases/20040700000000", + "/my/deploy/dir/releases/20040815162342" ] + Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases) + @provider.should_receive(:symlink) + FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342") + @provider.action_rollback + @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000") + end + end + it "raises a runtime error when there's no release to rollback to" do all_releases = [] Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases) chef/spec/unit/provider/deploy_spec.rb @@ -199,13 +199,15 @@ describe Chef::Provider::Git do @provider.should_receive(:clone) @provider.should_receive(:checkout) @provider.should_receive(:enable_submodules) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_checkout end - + it "does a sync by running the sync command" do ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true) ::Dir.stub!(:entries).and_return(['.','..',"lib", "spec"]) @provider.should_receive(:sync) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end @@ -213,6 +215,7 @@ describe Chef::Provider::Git do ::File.stub!(:exist?).with("/my/deploy/dir").and_return(false) @provider.should_receive(:action_checkout) @provider.should_not_receive(:run_command) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end @@ -222,13 +225,15 @@ describe Chef::Provider::Git do @provider.stub!(:sync_command).and_return("huzzah!") @provider.should_receive(:action_checkout) @provider.should_not_receive(:run_command).with(:command => "huzzah!", :cwd => "/my/deploy/dir") + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end it "does an export by cloning the repo then removing the .git directory" do @provider.should_receive(:action_checkout) FileUtils.should_receive(:rm_rf).with(@resource.destination + "/.git") + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_export end -end \ No newline at end of file +end chef/spec/unit/provider/git_spec.rb @@ -54,13 +54,13 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do @provider.load_current_resource end - it "should return a current resource with a nil version if the package is not found" do - ::Dir.stub!(:entries).and_return("git-1.0.0") + it "should return a current resource with the correct version if the package is found" do + ::Dir.stub!(:entries).and_return(["git-foobar-0.9", "git-1.0.0"]) @current_resource.should_receive(:version).with("1.0.0") @provider.load_current_resource end - - it "should return a current resource with the correct version if the package is found" do + + it "should return a current resource with a nil version if the package is not found" do ::Dir.stub!(:entries).and_return("notgit-1.0.0") @current_resource.should_receive(:version).with(nil) @provider.load_current_resource chef/spec/unit/provider/package/portage_spec.rb @@ -46,15 +46,8 @@ end describe Chef::Provider::Package::Rubygems, "install_package" do before(:each) do @node = mock("Chef::Node", :null_object => true) - @new_resource = mock("Chef::Resource::Package", - :null_object => true, - :name => "rspec", - :version => "1.2.2", - :package_name => "rspec", - :updated => nil, - :gem_binary => nil, - :source => nil - ) + @new_resource = Chef::Resource::GemPackage.new("rspec") + @new_resource.version "1.2.2" @provider = Chef::Provider::Package::Rubygems.new(@node, @new_resource) end @@ -67,4 +60,11 @@ describe Chef::Provider::Package::Rubygems, "install_package" do }) @provider.install_package("rspec", "1.2.2") end + + it "installs gems with arbitrary options set by resource's options" do + @new_resource.options "-i /arbitrary/install/dir" + @provider.should_receive(:run_command_with_systems_locale). + with(:command => "gem install rspec -q --no-rdoc --no-ri -v \"1.2.2\" -i /arbitrary/install/dir") + @provider.install_package("rspec", "1.2.2") + end end chef/spec/unit/provider/package/rubygems_spec.rb @@ -159,12 +159,14 @@ describe Chef::Provider::Subversion do it "runs the checkout command for action_checkout" do expected_cmd = "svn checkout -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir" @provider.should_receive(:run_command).with(:command => expected_cmd) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_checkout end it "does a checkout for action_sync if there's no deploy dir" do ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(false) @provider.should_receive(:action_checkout) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end @@ -172,6 +174,7 @@ describe Chef::Provider::Subversion do ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(true) ::Dir.should_receive(:entries).with("/my/deploy/dir").and_return(['.','..']) @provider.should_receive(:action_checkout) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end @@ -180,12 +183,14 @@ describe Chef::Provider::Subversion do ::Dir.should_receive(:entries).with("/my/deploy/dir").and_return(['.','..','the','app','exists']) expected_cmd = "svn update -q -r12345 /my/deploy/dir" @provider.should_receive(:run_command).with(:command => expected_cmd) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_sync end it "runs the export_command on action_export" do expected_cmd = "svn export -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir" @provider.should_receive(:run_command).with(:command => expected_cmd) + @resource.should_receive(:updated=).at_least(1).times.with(true) @provider.action_export end chef/spec/unit/provider/subversion_spec.rb @@ -73,7 +73,6 @@ describe Chef::Resource::Deploy do resource_has_a_boolean_attribute(:migrate, :defaults_to=>false) resource_has_a_boolean_attribute(:enable_submodules, :defaults_to=>false) resource_has_a_boolean_attribute(:shallow_clone, :defaults_to=>false) - resource_has_a_boolean_attribute(:force_deploy, :defaults_to=>false) it "uses the first argument as the deploy directory" do @resource.deploy_to.should eql("/my/deploy/dir") chef/spec/unit/resource/deploy_spec.rb @@ -14,6 +14,7 @@ api_nodes_show: --tags nodes_show --format pretty -r features/steps -r features/ api_nodes_update: --tags nodes_update --format pretty -r features/steps -r features/support features client: --tags client --format pretty -r features/steps -r features/support features client_roles: --tags client_roles --format pretty -r features/steps -r features/support features +client_run_interval: --tags client_run_interval --format pretty -r features/steps -r features/support features search: --tags search --format pretty -r features/steps -r features/support features language: --tags language --format pretty -r features/steps -r features/support features recipe_inclusion: --tags recipe_inclusion --format pretty -r features/steps -r features/support features @@ -21,5 +22,6 @@ provider_remote_file: --tags provider,remote_file --format pretty -r features/st provider_git: --tags provider,git --format pretty -r features/steps -r features/support features provider_template: --tags template --format pretty -r features/steps -r features/support features provider_package_macports: --tags macports --format pretty -r features/steps -r features/support features +provider_package_rubygems: --tags rubygems --format pretty -r features/steps -r features/support features lwrp: --tags lwrp --format pretty -r features/steps -r features/support features cucumber.yml @@ -1,4 +1,4 @@ -@client +@client @client_run_interval Feature: Run chef-client at periodic intervals In order to ensure a system is always correctly configured As an Administrator features/chef-client/run_interval.feature @@ -1,3 +1,14 @@ +Given /^the gems server is running$/ do + self.gemserver_thread = Thread.new do + trap("INT") do + gemserver.shutdown + gemserver_thread.join + end + + gemserver.start + end +end + Given /^that I have the (.+) package system installed$/ do |package_system| unless package_system_available?(package_system) pending "This Cucumber feature will not execute, as it is missing the #{package_system} packaging system." @@ -18,3 +29,7 @@ Then /^there should not be a binary on the path called '(.+)'$/ do |binary_name| result.should =~ /not found/ end end + +Then /^the gem '(.+)' version '(.+)' should be installed$/ do |gem_name, version| + Then "a file named 'installed-gems/gems/#{gem_name}-#{version}' should exist" +end \ No newline at end of file features/steps/packages.rb @@ -46,13 +46,13 @@ When /^I run the chef\-client with '(.+)' for '(.+)' seconds$/ do |args, run_for end When /^I run the chef\-client for '(.+)' seconds$/ do |run_for| - cid = fork { + cid = Process.fork { sleep run_for.to_i - client_pid = `ps ax | grep chef-client | grep -v grep | grep -v rake | grep -v cucumber | awk '{ print $1 }'` - Process.kill("INT", client_pid.to_i) + Process.kill("INT", /^(.+chef\-client.+\-i.*)$/.match(`ps -ef`).to_s.split[1].to_i) + exit } When 'I run the chef-client' - Process.waitpid2(cid) + Process.wait2(cid) end When /^I run the chef\-client at log level '(.+)'$/ do |log_level| features/steps/run_client_steps.rb @@ -28,6 +28,7 @@ require 'chef/client' require 'tmpdir' require 'merb-core' require 'merb_cucumber/world/webrat' +require 'webrick' def Spec.run? ; true; end @@ -57,7 +58,9 @@ end module ChefWorld - attr_accessor :recipe, :cookbook, :response, :inflated_response, :log_level, :chef_args, :config_file, :stdout, :stderr, :status, :exception + attr_accessor :recipe, :cookbook, :response, :inflated_response, :log_level, + :chef_args, :config_file, :stdout, :stderr, :status, :exception, + :gemserver_thread def client @client ||= Chef::Client.new @@ -87,11 +90,24 @@ module ChefWorld @stash ||= Hash.new end + def gemserver + @gemserver ||= WEBrick::HTTPServer.new( + :Port => 8000, + :DocumentRoot => datadir + "/gems/", + # Make WEBrick STFU + :Logger => Logger.new(StringIO.new), + :AccessLog => [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ] + ) + end + end World(ChefWorld) After do + gemserver.shutdown + gemserver_thread && gemserver_thread.join + cleanup_files.each do |file| system("rm #{file}") end features/support/env.rb 47070d66a24905428167cdd67985175f03a38d5b cff229140288370dc349ec43a535cd83304ccb1c Adam Jacob adam@opscode.com http://github.com/opscode/chef/commit/6ced5f1d985d47d49f39b7af10e01c295eefc2a9 6ced5f1d985d47d49f39b7af10e01c295eefc2a9 2009-10-29T08:17:48-07:00 2009-10-29T08:17:48-07:00 Merge branch 'master' into 0.8-alpha All tests pass. Conflicts: chef-server-slice/Rakefile chef-server/Rakefile chef/Rakefile chef/lib/chef.rb chef/lib/chef/provider/cron.rb chef/lib/chef/provider/service/freebsd.rb chef/lib/chef/provider/service/simple.rb chef/spec/unit/provider/deploy_spec.rb cucumber.yml features/support/env.rb 4d126fd1d30aa1feb9308f03e3ed61aa0cbd44ae Adam Jacob adam@opscode.com