diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-07-02 20:19:51 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-07-02 20:19:51 +0000 |
commit | 5f470f29dbcc2b082cc5d997252967790fc35118 (patch) | |
tree | 4cca4f824ba14c0a65830101ffebfdd089d1d450 | |
parent | 4ca23a0dd98c59e1cae29fd7ad6e485cbb12c2b3 (diff) | |
download | chef-5f470f29dbcc2b082cc5d997252967790fc35118.tar.gz |
Bump version to 14.3.25 by Chef Expeditorv14.3.25
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Gemfile.lock | 12 | ||||
-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, 13 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 685403e78b..36fa0f70bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.3.24 --> -## [v14.3.24](https://github.com/chef/chef/tree/v14.3.24) (2018-07-02) +<!-- latest_release 14.3.25 --> +## [v14.3.25](https://github.com/chef/chef/tree/v14.3.25) (2018-07-02) #### Merged Pull Requests -- Pull in new InSpec and win32-service [#7405](https://github.com/chef/chef/pull/7405) ([tas50](https://github.com/tas50)) -- Rename the kitchen base test suite to end-to-end [#7385](https://github.com/chef/chef/pull/7385) ([tas50](https://github.com/tas50)) +- Chefstyle fixes [#7414](https://github.com/chef/chef/pull/7414) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=14.2.0 --> ### Changes since 14.2.0 release #### Merged Pull Requests +- Chefstyle fixes [#7414](https://github.com/chef/chef/pull/7414) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.25 --> - Pull in new InSpec and win32-service [#7405](https://github.com/chef/chef/pull/7405) ([tas50](https://github.com/tas50)) <!-- 14.3.24 --> - Rename the kitchen base test suite to end-to-end [#7385](https://github.com/chef/chef/pull/7385) ([tas50](https://github.com/tas50)) <!-- 14.3.23 --> - Switch powershell_exec mixin to use FFI instead of COM [#7380](https://github.com/chef/chef/pull/7380) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.3.23 --> diff --git a/Gemfile.lock b/Gemfile.lock index 158d5dde1d..09976d50c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.3.24) + chef (14.3.25) addressable bundler (>= 1.10) - chef-config (= 14.3.24) + chef-config (= 14.3.25) 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.24-universal-mingw32) + chef (14.3.25-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.3.24) + chef-config (= 14.3.25) 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.24) + chef-config (14.3.25) addressable fuzzyurl mixlib-config (~> 2.0) @@ -179,7 +179,7 @@ GEM mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) - mixlib-config (2.2.8) + mixlib-config (2.2.10) tomlrb mixlib-log (2.0.4) mixlib-shellout (2.3.2) @@ -1 +1 @@ -14.3.24
\ No newline at end of file +14.3.25
\ 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 e7cf1f6274..0f88a18675 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.24" + VERSION = "14.3.25" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 4d98c99969..c8164e378b 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.24") + VERSION = Chef::VersionString.new("14.3.25") end # |