summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-21 18:03:16 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-21 18:03:16 +0000
commit50fb680ed3abffdc3ce1152ebf758615d132e7f8 (patch)
tree480fcd1ed413d59dd43acf138a1b1a8c04ecbd30
parent0fd98e0d267e9d5eef6ddea1026043470d235399 (diff)
downloadchef-50fb680ed3abffdc3ce1152ebf758615d132e7f8.tar.gz
Bump version to 14.9.10 by Chef Expeditorv14.9.10
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 ab9c8d8487..5f1ecd6309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.9.9 -->
-## [v14.9.9](https://github.com/chef/chef/tree/v14.9.9) (2019-01-18)
+<!-- latest_release 14.9.10 -->
+## [v14.9.10](https://github.com/chef/chef/tree/v14.9.10) (2019-01-21)
#### Merged Pull Requests
-- Backport various name_property fixes in resources from Chef 15 [#8134](https://github.com/chef/chef/pull/8134) ([tas50](https://github.com/tas50))
+- Allow for mixlib-archive 1.x [#8141](https://github.com/chef/chef/pull/8141) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.8.12 -->
### Changes since 14.8.12 release
#### Merged Pull Requests
+- Allow for mixlib-archive 1.x [#8141](https://github.com/chef/chef/pull/8141) ([tas50](https://github.com/tas50)) <!-- 14.9.10 -->
- Backport various name_property fixes in resources from Chef 15 [#8134](https://github.com/chef/chef/pull/8134) ([tas50](https://github.com/tas50)) <!-- 14.9.9 -->
- Update license scout to 1.0.22 [#8131](https://github.com/chef/chef/pull/8131) ([tas50](https://github.com/tas50)) <!-- 14.9.8 -->
- Chef 14: A windows support to the timezone resource [#8129](https://github.com/chef/chef/pull/8129) ([tas50](https://github.com/tas50)) <!-- 14.9.7 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a420fed2e7..e6e9e46fec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.9.9)
+ chef (14.9.10)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.9)
+ chef-config (= 14.9.10)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.9.9-universal-mingw32)
+ chef (14.9.10-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.9)
+ chef-config (= 14.9.10)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.9.9)
+ chef-config (14.9.10)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 5a8b877c70..24ae4d802f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.9 \ No newline at end of file
+14.9.10 \ 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 ce50d63237..bb91561bd0 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.9.9".freeze
+ VERSION = "14.9.10".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 72c2ea1a4c..1e9cfc306f 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.9.9")
+ VERSION = Chef::VersionString.new("14.9.10")
end
#