summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 8ecd7a84bc..44ebab1617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.3.34 -->
-## [v14.3.34](https://github.com/chef/chef/tree/v14.3.34) (2018-07-07)
+<!-- latest_release 14.3.35 -->
+## [v14.3.35](https://github.com/chef/chef/tree/v14.3.35) (2018-07-09)
#### Merged Pull Requests
-- Prevent failures using windows_feature due to the platform helper [#7433](https://github.com/chef/chef/pull/7433) ([tas50](https://github.com/tas50))
+- Bump Ohai to 14.3.0 [#7437](https://github.com/chef/chef/pull/7437) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Bump Ohai to 14.3.0 [#7437](https://github.com/chef/chef/pull/7437) ([tas50](https://github.com/tas50)) <!-- 14.3.35 -->
- Prevent failures using windows_feature due to the platform helper [#7433](https://github.com/chef/chef/pull/7433) ([tas50](https://github.com/tas50)) <!-- 14.3.34 -->
- Fix dupe stdout_logger [#7401](https://github.com/chef/chef/pull/7401) ([nsdavidson](https://github.com/nsdavidson)) <!-- 14.3.33 -->
- bump chefstyle + inspec-core [#7431](https://github.com/chef/chef/pull/7431) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 29c9cf7390..01114cb99f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.34)
+ chef (14.3.35)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.34)
+ chef-config (= 14.3.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.3.34-universal-mingw32)
+ chef (14.3.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.34)
+ chef-config (= 14.3.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.3.34)
+ chef-config (14.3.35)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 291fc52005..a06b29ff6b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.34 \ No newline at end of file
+14.3.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 712c3480e3..41b15d0590 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.3.34".freeze
+ VERSION = "14.3.35".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 5b3de83e15..99b8b7e4ae 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.3.34")
+ VERSION = Chef::VersionString.new("14.3.35")
end
#