summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-04 11:56:47 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-04 11:56:47 +0000
commit0c8cd3a31adfe376bff41af716ff9c2a49f2838f (patch)
treebb68f5b10bfe773fe034848b51c99a70f287702c
parent2059ba907b1d0305011eda20000b06baa8c2546b (diff)
downloadchef-0c8cd3a31adfe376bff41af716ff9c2a49f2838f.tar.gz
Bump version to 13.3.33 by Chef Expeditorv13.3.33
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e5904bbb..c8b260da60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release -->
-## [v13.3.32](https://github.com/chef/chef/tree/v13.3.32) (2017-07-31)
+<!-- latest_release 13.3.33 -->
+## [v13.3.33](https://github.com/chef/chef/tree/v13.3.33) (2017-08-04)
#### Merged Pull Requests
-- Add .dockerignore to reduce size of resulting images [#6296](https://github.com/chef/chef/pull/6296) ([tduffield](https://github.com/tduffield))
+- Fix git command in DCO sign-off example [#6306](https://github.com/chef/chef/pull/6306) ([edmorley](https://github.com/edmorley))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Fix git command in DCO sign-off example [#6306](https://github.com/chef/chef/pull/6306) ([edmorley](https://github.com/edmorley)) <!-- 13.3.33 -->
- Add .dockerignore to reduce size of resulting images [#6296](https://github.com/chef/chef/pull/6296) ([tduffield](https://github.com/tduffield)) <!-- 13.3.32 -->
- Set explicit page size for every search request [#6299](https://github.com/chef/chef/pull/6299) ([stevendanna](https://github.com/stevendanna)) <!-- 13.3.31 -->
- Fix typos [#6298](https://github.com/chef/chef/pull/6298) ([akitada](https://github.com/akitada)) <!-- 13.3.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3bff641533..a0a0f30a08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.32)
+ chef (13.3.33)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.32)
+ chef-config (= 13.3.33)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.3.32-universal-mingw32)
+ chef (13.3.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.32)
+ chef-config (= 13.3.33)
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 (13.3.32)
+ chef-config (13.3.33)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -300,7 +300,7 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
- serverspec (2.39.1)
+ serverspec (2.39.2)
multi_json
rspec (~> 3.0)
rspec-its
@@ -312,7 +312,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
slop (3.6.0)
- specinfra (2.70.0)
+ specinfra (2.70.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 5290445690..fede0ca8a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.32 \ No newline at end of file
+13.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 6860e7172d..d1dde8afce 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.32"
+ VERSION = "13.3.33"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7f3121c3b5..f9a47d428d 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.32")
+ VERSION = Chef::VersionString.new("13.3.33")
end
#