summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-23 13:23:43 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-23 13:23:43 +0000
commit2e93478749af50eebfdf885dcbfee92cb6e7c688 (patch)
treedbcb4f2b7f181906460d82af663c4268a901bf7f
parent9140726bc58806bdc3147c5584e067fa6ffad0d2 (diff)
downloadchef-2e93478749af50eebfdf885dcbfee92cb6e7c688.tar.gz
Bump version to 14.6.35 by Chef Expeditorv14.6.35
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 e53307c1a9..53eb70035c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.34 -->
-## [v14.6.34](https://github.com/chef/chef/tree/v14.6.34) (2018-10-19)
+<!-- latest_release 14.6.35 -->
+## [v14.6.35](https://github.com/chef/chef/tree/v14.6.35) (2018-10-23)
#### Merged Pull Requests
-- Bump train-core to 1.5.4 [#7760](https://github.com/chef/chef/pull/7760) ([chef-ci](https://github.com/chef-ci))
+- Update Ruby to 2.5.3 [#7766](https://github.com/chef/chef/pull/7766) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Update Ruby to 2.5.3 [#7766](https://github.com/chef/chef/pull/7766) ([tas50](https://github.com/tas50)) <!-- 14.6.35 -->
- Bump train-core to 1.5.4 [#7760](https://github.com/chef/chef/pull/7760) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.34 -->
- Bump mixlib-archive to 0.4.18 [#7759](https://github.com/chef/chef/pull/7759) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.33 -->
- Update omnibus to use ruby-cleanup definition [#7757](https://github.com/chef/chef/pull/7757) ([tas50](https://github.com/tas50)) <!-- 14.6.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 19c601cb0a..41973b8f8e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.34)
+ chef (14.6.35)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.34)
+ chef-config (= 14.6.35)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.34-universal-mingw32)
+ chef (14.6.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.34)
+ chef-config (= 14.6.35)
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.6.34)
+ chef-config (14.6.35)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 87db246db7..8aedd0d721 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.34 \ No newline at end of file
+14.6.35 \ 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 98feb80c95..7e13c63efc 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.6.34".freeze
+ VERSION = "14.6.35".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a7cbfd3742..a3d061c6fa 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.6.34")
+ VERSION = Chef::VersionString.new("14.6.35")
end
#