diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-16 10:18:08 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-16 10:18:08 -0800 |
| commit | 1d802c0186e18182d72e5d9b4f7556de976527ac (patch) | |
| tree | c7e3b6084320693e53286ca6c7259a50a44c8e4e | |
| parent | bf74ffe931f8e949e06e6d4639a364fe5a06f0d4 (diff) | |
| parent | 890e779b5ff4dc5a30f874dabf6ea0027164635c (diff) | |
| download | chef-1d802c0186e18182d72e5d9b4f7556de976527ac.tar.gz | |
Merge pull request #4584 from chef/post_1272_release
Post 12.7.2 release follow up items
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index baf46a20c8..0330ab40ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 12.8.0 + ## 12.7.2 * [pr#4559](https://github.com/chef/chef/pull/4559) Remove learnchef acceptance tests until we make them more reliable diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 80d3efd27b..8f947cd5e6 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,5 @@ +# Chef Client Release Notes 12.8: + # Chef Client Release Notes 12.7: ## Updates to versioning strategy @@ -1 +1 @@ -12.7.2 +12.8.0 diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 2e54dd3d80..3840ff0319 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__))) - VERSION = "12.7.2" + VERSION = "12.8.0" end # diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 2c3de60108..3fcbcf6f78 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -1,8 +1,6 @@ --- driver: name: ec2 - aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %> - aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %> region: "us-west-2" availability_zone: "us-west-2a" diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ed80b186d9..6c1fe2227a 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__))) - VERSION = "12.7.2" + VERSION = "12.8.0" end # diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index c85a8ac85d..5926538bb8 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -50,7 +50,7 @@ override :rubygems, version: "2.5.2" # Chef Release version pinning override :chef, version: "local_source" -override :ohai, version: "v8.10.0" +override :ohai, version: "master" dependency "preparation" dependency "chef" |