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 ac57820034..b29cc8f4fd 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.31 -->
-## [v14.1.31](https://github.com/chef/chef/tree/v14.1.31) (2018-06-01)
+<!-- latest_release 14.1.32 -->
+## [v14.1.32](https://github.com/chef/chef/tree/v14.1.32) (2018-06-03)
#### Merged Pull Requests
-- Check local file exists before installing a windows package [#7299](https://github.com/chef/chef/pull/7299) ([josh-barker](https://github.com/josh-barker))
+- Fix :configure_startup action to configure delayed start [#7297](https://github.com/chef/chef/pull/7297) ([jasonwbarnett](https://github.com/jasonwbarnett))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- Fix :configure_startup action to configure delayed start [#7297](https://github.com/chef/chef/pull/7297) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.1.32 -->
- Check local file exists before installing a windows package [#7299](https://github.com/chef/chef/pull/7299) ([josh-barker](https://github.com/josh-barker)) <!-- 14.1.31 -->
- resource_inspector: Add default values for properties [#7300](https://github.com/chef/chef/pull/7300) ([thommay](https://github.com/thommay)) <!-- 14.1.30 -->
- fix yum versionlock quoting [#7329](https://github.com/chef/chef/pull/7329) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.29 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index da014f0f86..0cc88e7cbd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.31)
+ chef (14.1.32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.31)
+ chef-config (= 14.1.32)
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.31-universal-mingw32)
+ chef (14.1.32-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.31)
+ chef-config (= 14.1.32)
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.31)
+ chef-config (14.1.32)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index b6b5d855c3..402aabeae4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.31 \ No newline at end of file
+14.1.32 \ 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 75cb6d8130..8e72601ce5 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.31"
+ VERSION = "14.1.32"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4d22e1602c..0505886a59 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.31")
+ VERSION = Chef::VersionString.new("14.1.32")
end
#