summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-25 18:26:10 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-25 18:26:10 +0000
commitbccde4869401106047ee156fac514893fb5aa4e1 (patch)
tree349e1b5c2d4d5491a2c05d5a056230c19de6c516
parent7d57fb9793d48c00c0c561eb8c275d27d9f9ee5d (diff)
downloadchef-bccde4869401106047ee156fac514893fb5aa4e1.tar.gz
Bump version to 14.10.2 by Chef Expeditorv14.10.2
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 f97d8e179c..c7398541fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.10.1 -->
-## [v14.10.1](https://github.com/chef/chef/tree/v14.10.1) (2019-01-24)
+<!-- latest_release 14.10.2 -->
+## [v14.10.2](https://github.com/chef/chef/tree/v14.10.2) (2019-01-25)
#### Merged Pull Requests
-- Add a deprecation warning to knife cookbook site [#8164](https://github.com/chef/chef/pull/8164) ([tas50](https://github.com/tas50))
+- Update nokogiri to 1.10.1 [#8172](https://github.com/chef/chef/pull/8172) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.9.13 -->
### Changes since 14.9.13 release
#### Merged Pull Requests
+- Update nokogiri to 1.10.1 [#8172](https://github.com/chef/chef/pull/8172) ([tas50](https://github.com/tas50)) <!-- 14.10.2 -->
- Add a deprecation warning to knife cookbook site [#8164](https://github.com/chef/chef/pull/8164) ([tas50](https://github.com/tas50)) <!-- 14.10.1 -->
- windows_certificate: Ensure all actions are fully idempotent [#8163](https://github.com/chef/chef/pull/8163) ([tas50](https://github.com/tas50)) <!-- 14.10.0 -->
- Bump all deps to the latest versions [#8154](https://github.com/chef/chef/pull/8154) ([tas50](https://github.com/tas50)) <!-- 14.9.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1f82b13bf9..6e090d1fe5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.10.1)
+ chef (14.10.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.10.1)
+ chef-config (= 14.10.2)
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.10.1-universal-mingw32)
+ chef (14.10.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.10.1)
+ chef-config (= 14.10.2)
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.10.1)
+ chef-config (14.10.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 76b91118e0..11079fff98 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.10.1 \ No newline at end of file
+14.10.2 \ 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 d16df4f074..c52817ccd2 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.10.1".freeze
+ VERSION = "14.10.2".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 99b4335f73..5696e380d8 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.10.1")
+ VERSION = Chef::VersionString.new("14.10.2")
end
#