summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-07 04:58:41 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-07 04:58:41 +0000
commit2b663939d4dd0b7985ef89a3f30ca94c2064772b (patch)
treed29301f39cb6fc61e21a11b29f8e5be0001650b4
parentb98c6a75b3edbac1c3acc191e8a5b935335b2ee9 (diff)
downloadchef-2b663939d4dd0b7985ef89a3f30ca94c2064772b.tar.gz
Bump version to 14.3.33 by Chef Expeditorv14.3.33
-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 a151bf0586..e8e4d7c36a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.3.32 -->
-## [v14.3.32](https://github.com/chef/chef/tree/v14.3.32) (2018-07-06)
+<!-- latest_release 14.3.33 -->
+## [v14.3.33](https://github.com/chef/chef/tree/v14.3.33) (2018-07-07)
#### Merged Pull Requests
-- bump chefstyle + inspec-core [#7431](https://github.com/chef/chef/pull/7431) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix dupe stdout_logger [#7401](https://github.com/chef/chef/pull/7401) ([nsdavidson](https://github.com/nsdavidson))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Fix dupe stdout_logger [#7401](https://github.com/chef/chef/pull/7401) ([nsdavidson](https://github.com/nsdavidson)) <!-- 14.3.33 -->
- bump chefstyle + inspec-core [#7431](https://github.com/chef/chef/pull/7431) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.32 -->
- Don&#39;t require rubygems in our binaries [#7428](https://github.com/chef/chef/pull/7428) ([tas50](https://github.com/tas50)) <!-- 14.3.31 -->
- fix some chefstyle offenses [#7427](https://github.com/chef/chef/pull/7427) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 49ddafb566..167d26017d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.32)
+ chef (14.3.33)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.32)
+ chef-config (= 14.3.33)
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.32-universal-mingw32)
+ chef (14.3.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.32)
+ chef-config (= 14.3.33)
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.32)
+ chef-config (14.3.33)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 2d0fac018f..e78e705318 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.32 \ No newline at end of file
+14.3.33 \ 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 7b96841a7a..ec14ec3636 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.32".freeze
+ VERSION = "14.3.33".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 58817fe83f..b866f6cc02 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.32")
+ VERSION = Chef::VersionString.new("14.3.33")
end
#