summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-30 18:09:58 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-30 18:09:58 +0000
commiteccb2ee8dec805de3cffc4653333466813699d90 (patch)
treee71d2df8745ebd7e3de439536153dc7b536eed86
parent6a5c6c3426b3fb144ab305072a9353214214850f (diff)
downloadchef-eccb2ee8dec805de3cffc4653333466813699d90.tar.gz
Bump version to 14.13.11 by Chef Expeditorv14.13.11hab-pkg-chef-client
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 d4640c0a81..52929b391b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.13.10 -->
-## [v14.13.10](https://github.com/chef/chef/tree/v14.13.10) (2019-05-30)
+<!-- latest_release 14.13.11 -->
+## [v14.13.11](https://github.com/chef/chef/tree/v14.13.11) (2019-05-30)
#### Merged Pull Requests
-- Fix for cron resource get confused by environment/property mismatch [#8610](https://github.com/chef/chef/pull/8610) ([tas50](https://github.com/tas50))
+- 14: backport knife fixes [#8621](https://github.com/chef/chef/pull/8621) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.12.9 -->
### Changes since 14.12.9 release
#### Merged Pull Requests
+- 14: backport knife fixes [#8621](https://github.com/chef/chef/pull/8621) ([btm](https://github.com/btm)) <!-- 14.13.11 -->
- Fix for cron resource get confused by environment/property mismatch [#8610](https://github.com/chef/chef/pull/8610) ([tas50](https://github.com/tas50)) <!-- 14.13.10 -->
- Fix for write permissions were not working properly on windows [#8613](https://github.com/chef/chef/pull/8613) ([tas50](https://github.com/tas50)) <!-- 14.13.9 -->
- fix knife diff exceptions [#8612](https://github.com/chef/chef/pull/8612) ([tas50](https://github.com/tas50)) <!-- 14.13.8 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index feb2d65c38..fabccce337 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.13.10)
+ chef (14.13.11)
addressable
bundler (>= 1.10)
- chef-config (= 14.13.10)
+ chef-config (= 14.13.11)
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.13.10-universal-mingw32)
+ chef (14.13.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.13.10)
+ chef-config (= 14.13.11)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.13.10)
+ chef-config (14.13.11)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index a285256bab..510a161564 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.13.10 \ No newline at end of file
+14.13.11 \ 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 c57d08efae..7eb4c546a5 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.13.10".freeze
+ VERSION = "14.13.11".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index db14191f31..c9686e1f04 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.13.10")
+ VERSION = Chef::VersionString.new("14.13.11")
end
#