Skip to content

Commit 765aaca

Browse files
adamhjkadamhjk
committed
Merge branch 'master' into skeptomai/chef-54a
Conflicts: NOTICE chef-server/NOTICE chef-server/Rakefile chef-server/lib/init.rb chef/bin/chef-client
2 parents d0af93d + 5bb2941 commit 765aaca

34 files changed

Lines changed: 1850 additions & 140 deletions

File tree

‎CHANGELOG‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
Thu Mar 5 19:51:02 PST 2009
2+
Release Notes - Chef - Version 0.5.6
3+
http://tickets.opscode.com
4+
5+
** Bug
6+
* [CHEF-112] - FreeBSD service provider does not enable service in /etc/rc.conf if service_enable line is not already there
7+
* [CHEF-115] - Remote file resource appears to have reserved words that if used, lead to a 404 error
8+
* [CHEF-118] - FreeBSD package provider can not read the candidate version of the port "php5-mysql"
9+
* [CHEF-119] - FreeBSD service provider uses incorrect name for enabling MySQL server in /etc/rc.conf
10+
* [CHEF-126] - chef session_secret_key is hard-coded
11+
* [CHEF-132] - cron resource should check integer values and convert to string
12+
* [CHEF-138] - remote_directory doesn't work
13+
* [CHEF-139] - log_level doesn't affect the actual log level
14+
* [CHEF-141] - remote_file with URL source does not obey http 301 redirects
15+
* [CHEF-149] - chef-client banner
16+
17+
** Improvement
18+
* [CHEF-54] - chef-server should be a merb slice
19+
* [CHEF-102] - display template error line numbers to aid debugging
20+
* [CHEF-140] - Chef client should know how to use client certs
21+
* [CHEF-146] - Should be able to run features from scratch, starting couch and other deps
22+
* [CHEF-150] - Resource names are limited to one underscore
23+
* [CHEF-152] - The mount resource should be able to add/remove entries in /etc/fstab
24+
25+
** New Feature
26+
* [CHEF-80] - rpm package provider
27+
* [CHEF-93] - mount / filesystem provider and resource type
28+
* [CHEF-130] - Cucumber integration testing
29+
130
Fri Feb 13 12:26:07 PST 2009
231
Release Notes - Chef - Version 0.5.4
332
http://tickets.opscode.com/

‎NOTICE‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Contributors and Copyright holders:
1111
* Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
1212
* Copyright 2009, Sean Cribbs <seancribbs@gmail.com>
1313
* Copyright 2009, Christopher Brown <cb@opscode.com>
14-
14+
* Copyright 2009, Thom May <thom@clearairturbulence.org>
15+
1516
Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.
1617

1718
Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard.

‎chef-server/NOTICE‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎chef-server/Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require 'chef'
1010
include FileUtils
1111

1212
GEM = "chef-server"
13-
CHEF_SERVER_VERSION = "0.5.5"
13+
CHEF_SERVER_VERSION = "0.5.7"
1414
AUTHOR = "Opscode"
1515
EMAIL = "chef@opscode.com"
1616
HOMEPAGE = "http://wiki.opscode.com/display/chef"

‎chef-server/chef-server.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = %q{chef-server}
3-
s.version = "0.5.5"
3+
s.version = "0.5.7"
44

55
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
66
s.authors = ["Adam Jacob"]

‎chef/NOTICE‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎chef/Rakefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require 'rake/rdoctask'
44
require './tasks/rspec.rb'
55

66
GEM = "chef"
7-
CHEF_VERSION = "0.5.5"
7+
CHEF_VERSION = "0.5.7"
88
AUTHOR = "Adam Jacob"
99
EMAIL = "adam@opscode.com"
1010
HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
1515
s.version = CHEF_VERSION
1616
s.platform = Gem::Platform::RUBY
1717
s.has_rdoc = true
18-
s.extra_rdoc_files = ["README.txt", "LICENSE", 'NOTICE']
18+
s.extra_rdoc_files = ["README.txt", "LICENSE" ]
1919
s.summary = SUMMARY
2020
s.description = s.summary
2121
s.author = AUTHOR

‎chef/bin/chef-client‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ config = {
2929
:config_file => "/etc/chef/client.rb"
3030
}
3131
opts = OptionParser.new do |opts|
32-
opts.banner = "Usage: #{$0} [-d DIR|-r FILE] (options)"
32+
opts.banner = "Usage: #{$0} (options)"
3333
client_option_hash = {
3434
:config_file=> { :short=>"-c CONFIG", :long=>"--config CONFIG", :description=>"The Chef Config file to use", :proc=>nil },
3535
:user=> { :short=>"-u USER", :long=>"--user USER", :description=>"User to change uid to before daemonizing", :proc=>nil },

‎chef/chef.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = %q{chef}
3-
s.version = "0.5.5"
3+
s.version = "0.5.7"
44

55
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
66
s.authors = ["Adam Jacob"]

‎chef/lib/chef.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
2828

2929
class Chef
30-
VERSION = '0.5.5'
30+
VERSION = '0.5.7'
3131

3232
class << self
3333
def fatal!(msg, err = -1)

0 commit comments

Comments
 (0)