summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-07 20:06:16 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-07 20:06:16 +0000
commitf6b899fadd906bfb9918ff15992d649c8df66347 (patch)
treeaa2f68860dfde265537a190a5f4092237a485035
parentfde29420a02c1b5c558d9a1699017a55659ce37b (diff)
downloadchef-f6b899fadd906bfb9918ff15992d649c8df66347.tar.gz
Bump version to 14.11.6 by Chef Expeditorv14.11.6
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f12426f979..bb43815b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.11.5 -->
-## [v14.11.5](https://github.com/chef/chef/tree/v14.11.5) (2019-02-06)
+<!-- latest_release 14.11.6 -->
+## [v14.11.6](https://github.com/chef/chef/tree/v14.11.6) (2019-02-07)
#### Merged Pull Requests
-- Update InSpec to 3.5.0 [#8214](https://github.com/chef/chef/pull/8214) ([tas50](https://github.com/tas50))
+- Chef-14: add ed25519 gemset and update omnibus-software [#8222](https://github.com/chef/chef/pull/8222) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.10.9 -->
### Changes since 14.10.9 release
#### Merged Pull Requests
+- Chef-14: add ed25519 gemset and update omnibus-software [#8222](https://github.com/chef/chef/pull/8222) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.11.6 -->
- Update InSpec to 3.5.0 [#8214](https://github.com/chef/chef/pull/8214) ([tas50](https://github.com/tas50)) <!-- 14.11.5 -->
- chef-solo: Fixes for extra cookbook_path with parent dir that doesn&#39;t exist causes crash [#8209](https://github.com/chef/chef/pull/8209) ([tas50](https://github.com/tas50)) <!-- 14.11.4 -->
- Update knife bootstrap template to use up to date omnitruck URL [#8207](https://github.com/chef/chef/pull/8207) ([tas50](https://github.com/tas50)) <!-- 14.11.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 05a240a176..e4fa206767 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.5)
+ chef (14.11.6)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.5)
+ chef-config (= 14.11.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.11.5-universal-mingw32)
+ chef (14.11.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.5)
+ chef-config (= 14.11.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -78,7 +78,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.11.5)
+ chef-config (14.11.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 7faae47d6d..08b5f5316d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.5 \ No newline at end of file
+14.11.6 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0782ea2e51..bb892470eb 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.expand_path("../..", __FILE__)
- VERSION = "14.11.5".freeze
+ VERSION = "14.11.6".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1970c701d4..77a221c2d1 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.11.5")
+ VERSION = Chef::VersionString.new("14.11.6")
end
#