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 20de381b1a..58b1a80fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.1.25 --> -## [v14.1.25](https://github.com/chef/chef/tree/v14.1.25) (2018-05-31) +<!-- latest_release 14.1.26 --> +## [v14.1.26](https://github.com/chef/chef/tree/v14.1.26) (2018-05-31) #### Merged Pull Requests -- windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay)) +- Better errors with uninstalled official knife plugins [#7326](https://github.com/chef/chef/pull/7326) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.1.12 --> ### Changes since 14.1.12 release #### Merged Pull Requests +- Better errors with uninstalled official knife plugins [#7326](https://github.com/chef/chef/pull/7326) ([tas50](https://github.com/tas50)) <!-- 14.1.26 --> - windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay)) <!-- 14.1.25 --> - Properly print path to config file to the screen in knife configure [#7325](https://github.com/chef/chef/pull/7325) ([tas50](https://github.com/tas50)) <!-- 14.1.24 --> - add default_env flag to shell_out and execute resource [#7298](https://github.com/chef/chef/pull/7298) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.23 --> diff --git a/Gemfile.lock b/Gemfile.lock index 8ba0dd67e5..1dc4968076 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GIT PATH remote: . specs: - chef (14.1.25) + chef (14.1.26) addressable bundler (>= 1.10) - chef-config (= 14.1.25) + chef-config (= 14.1.26) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -46,10 +46,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.1.25-universal-mingw32) + chef (14.1.26-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.1.25) + chef-config (= 14.1.26) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.1.25) + chef-config (14.1.26) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.1.25
\ No newline at end of file +14.1.26
\ 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 d5dbc00197..655c933821 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.1.25" + VERSION = "14.1.26" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 6e4b42741d..0af0fd2eec 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.1.25") + VERSION = Chef::VersionString.new("14.1.26") end # |