summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-03-31 20:40:52 +0000
committerChef Expeditor <expeditor@chef.io>2020-03-31 20:40:54 +0000
commit66f015334a4ef68e6da65bca88bae5c5fc3421dc (patch)
tree6bec46693d4f0ec1e1ada0fc89e9716ec5b4717a
parent89d599e760683f213bacfd496c80c41e510a05b3 (diff)
downloadchef-66f015334a4ef68e6da65bca88bae5c5fc3421dc.tar.gz
Bump version to 15.9.6 by Chef Expeditorv15.9.6
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b346b95d70..d9dde715a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.9.5 -->
-## [v15.9.5](https://github.com/chef/chef/tree/v15.9.5) (2020-03-31)
+<!-- latest_release 15.9.6 -->
+## [v15.9.6](https://github.com/chef/chef/tree/v15.9.6) (2020-03-31)
#### Merged Pull Requests
-- Update all our links to use the new docs site format / cleanup descriptions [#9554](https://github.com/chef/chef/pull/9554) ([tas50](https://github.com/tas50))
+- Skip the ifconfig functional tests if we don&#39;t have ifconfig [#9555](https://github.com/chef/chef/pull/9555) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.8.23 -->
### Changes not yet released to stable channel
#### Merged Pull Requests
+- Skip the ifconfig functional tests if we don&#39;t have ifconfig [#9555](https://github.com/chef/chef/pull/9555) ([tas50](https://github.com/tas50)) <!-- 15.9.6 -->
- Update all our links to use the new docs site format / cleanup descriptions [#9554](https://github.com/chef/chef/pull/9554) ([tas50](https://github.com/tas50)) <!-- 15.9.5 -->
- Switch to RUBY_PLATFORM for the windows check [#9557](https://github.com/chef/chef/pull/9557) ([tas50](https://github.com/tas50)) <!-- 15.9.4 -->
- backport chef-utils comment fixes [#9505](https://github.com/chef/chef/pull/9505) ([tas50](https://github.com/tas50)) <!-- 15.9.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6383d8ea02..ab3a12cd54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.9.5)
+ chef (15.9.6)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.5)
- chef-utils (= 15.9.5)
+ chef-config (= 15.9.6)
+ chef-utils (= 15.9.6)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.9.5-universal-mingw32)
+ chef (15.9.6-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.5)
- chef-utils (= 15.9.5)
+ chef-config (= 15.9.6)
+ chef-utils (= 15.9.6)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.9.5)
- chef (= 15.9.5)
+ chef-bin (15.9.6)
+ chef (= 15.9.6)
PATH
remote: chef-config
specs:
- chef-config (15.9.5)
+ chef-config (15.9.6)
addressable
- chef-utils (= 15.9.5)
+ chef-utils (= 15.9.6)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.9.5)
+ chef-utils (15.9.6)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 252fd0533d..c7c1b69191 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.5 \ No newline at end of file
+15.9.6 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 85b8387399..c7fd97af14 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.5".freeze
+ VERSION = "15.9.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6a40d052cd..46225cdd42 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.5".freeze
+ VERSION = "15.9.6".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8ef40393df..e08f28dc51 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.5".freeze
+ VERSION = "15.9.6".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c02a2983fd..cca36fb773 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.9.5")
+ VERSION = Chef::VersionString.new("15.9.6")
end
#