diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 32bd92958b..2a8aafc6c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.34 --> -## [v12.21.34](https://github.com/chef/chef/tree/v12.21.34) (2018-01-31) +<!-- latest_release 12.21.35 --> +## [v12.21.35](https://github.com/chef/chef/tree/v12.21.35) (2018-01-31) #### Merged Pull Requests -- Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50)) +- backport #6746 [#6817](https://github.com/chef/chef/pull/6817) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=12.21.31 --> ### Changes since 12.21.31 release #### Merged Pull Requests +- backport #6746 [#6817](https://github.com/chef/chef/pull/6817) ([thommay](https://github.com/thommay)) <!-- 12.21.35 --> - Format omnibus readme markdown [#6814](https://github.com/chef/chef/pull/6814) ([tas50](https://github.com/tas50)) <!-- 12.21.34 --> - Fix Dockerfile & Travis/Appveyor failures [#6811](https://github.com/chef/chef/pull/6811) ([tas50](https://github.com/tas50)) <!-- 12.21.33 --> - Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50)) <!-- 12.21.32 --> diff --git a/Gemfile.lock b/Gemfile.lock index 016a89532d..4a3433c73b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.34) + chef (12.21.35) addressable bundler (>= 1.10) - chef-config (= 12.21.34) + chef-config (= 12.21.35) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -67,10 +67,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.21.34-universal-mingw32) + chef (12.21.35-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.34) + chef-config (= 12.21.35) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -111,7 +111,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.21.34) + chef-config (12.21.35) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.34
\ No newline at end of file +12.21.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 9ddaa40bd1..deae985871 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 = "12.21.34" + VERSION = "12.21.35" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3bccb619a5..a5ba56d185 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.34" + VERSION = "12.21.35" end # |