diff options
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-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, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index af10bb688b..97dfa1f35d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.39 --> -## [v14.0.39](https://github.com/chef/chef/tree/v14.0.39) (2018-01-29) +<!-- latest_release 14.0.40 --> +## [v14.0.40](https://github.com/chef/chef/tree/v14.0.40) (2018-01-30) #### Merged Pull Requests -- Ensure package (un)locking is idempotent [#6494](https://github.com/chef/chef/pull/6494) ([Rarian](https://github.com/Rarian)) +- Fix Appveyor testing: the format of this flametest doesn't matter [#6808](https://github.com/chef/chef/pull/6808) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Fix Appveyor testing: the format of this flametest doesn't matter [#6808](https://github.com/chef/chef/pull/6808) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.40 --> - Ensure package (un)locking is idempotent [#6494](https://github.com/chef/chef/pull/6494) ([Rarian](https://github.com/Rarian)) <!-- 14.0.39 --> - use a stricter comparison so knife ssh only fails if --exit-on-error [#6582](https://github.com/chef/chef/pull/6582) ([sarkis](https://github.com/sarkis)) <!-- 14.0.38 --> - Update error handling for "knife status" #3287 [#6756](https://github.com/chef/chef/pull/6756) ([cramaechi](https://github.com/cramaechi)) <!-- 14.0.37 --> diff --git a/Gemfile.lock b/Gemfile.lock index 2790f77d14..7c72fccad1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: b5f510c6338f2bc0ced874a126741113fd94fb96 + revision: 81983d49b60a3de310aef8a09a57dac8d690bc36 branch: master specs: - ohai (14.0.0) + ohai (14.0.1) chef-config (>= 12.5.0.alpha.1, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.39) + chef (14.0.40) addressable bundler (>= 1.10) - chef-config (= 14.0.39) + chef-config (= 14.0.40) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.39-universal-mingw32) + chef (14.0.40-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.39) + chef-config (= 14.0.40) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.39) + chef-config (14.0.40) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.39
\ No newline at end of file +14.0.40
\ 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 b99b3cef41..aae6c28a45 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.0.39" + VERSION = "14.0.40" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b052f39345..ec8a8e1841 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.0.39") + VERSION = Chef::VersionString.new("14.0.40") end # |