summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-11 17:40:57 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-11 17:40:57 +0000
commit3777f77bc0ccace0a7f11015e3fb4c7de4a43823 (patch)
tree4db7e3e1e316ee360d3ffdf68b4c3ae6ff405bf2
parentd6a7c899fdec7855bfce4ca43bb0d12aeb4d26b2 (diff)
downloadchef-3777f77bc0ccace0a7f11015e3fb4c7de4a43823.tar.gz
Bump version to 14.3.2 by Chef Expeditorv14.3.2
-rw-r--r--CHANGELOG.md8
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a04d1bdf6b..ba26adf54d 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.1 -->
-## [v14.3.1](https://github.com/chef/chef/tree/v14.3.1) (2018-06-11)
+<!-- latest_release 14.3.2 -->
+## [v14.3.2](https://github.com/chef/chef/tree/v14.3.2) (2018-06-11)
#### Merged Pull Requests
-- Deprecated the Chef::Provider::Package::Freebsd::Pkg provider [#7350](https://github.com/chef/chef/pull/7350) ([tas50](https://github.com/tas50))
-- Bump the version to 14.3.0 [#7346](https://github.com/chef/chef/pull/7346) ([tas50](https://github.com/tas50))
+- Make shell_out_compact automatically pull timeouts off the resource + remove uses of shell_out_compact_timeout [#7330](https://github.com/chef/chef/pull/7330) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Make shell_out_compact automatically pull timeouts off the resource + remove uses of shell_out_compact_timeout [#7330](https://github.com/chef/chef/pull/7330) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.2 -->
- Deprecated the Chef::Provider::Package::Freebsd::Pkg provider [#7350](https://github.com/chef/chef/pull/7350) ([tas50](https://github.com/tas50)) <!-- 14.3.1 -->
- Bump the version to 14.3.0 [#7346](https://github.com/chef/chef/pull/7346) ([tas50](https://github.com/tas50)) <!-- 14.3.0 -->
- Support windows_feature_powershell on Windows 2008 R2 [#7349](https://github.com/chef/chef/pull/7349) ([tas50](https://github.com/tas50)) <!-- 14.2.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ed50bcb208..d998eda165 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.1)
+ chef (14.3.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.1)
+ chef-config (= 14.3.2)
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.1-universal-mingw32)
+ chef (14.3.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.1)
+ chef-config (= 14.3.2)
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.1)
+ chef-config (14.3.2)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 7ea95c24dd..4abdeacbb9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.1 \ No newline at end of file
+14.3.2 \ 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 c2cb44539a..626e6b7e9b 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.1"
+ VERSION = "14.3.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b08a847d7b..cfbe45aba2 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.1")
+ VERSION = Chef::VersionString.new("14.3.2")
end
#