summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-31 13:15:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-31 13:15:02 +0000
commit97dee8d4dc0c0f618ec6427b84246a5a439b3d23 (patch)
tree33beafdf009732f140fc3f5d13b753adaa54b259
parent11ecbc4caf9e027f7bb34d09a6af61773d6adb44 (diff)
downloadchef-97dee8d4dc0c0f618ec6427b84246a5a439b3d23.tar.gz
Bump version to 13.3.32 by Chef Expeditorv13.3.32
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4361af2fd..b0e5904bbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
<!-- latest_release -->
-## [v13.3.31](https://github.com/chef/chef/tree/v13.3.31) (2017-07-31)
+## [v13.3.32](https://github.com/chef/chef/tree/v13.3.32) (2017-07-31)
#### Merged Pull Requests
-- Set explicit page size for every search request [#6299](https://github.com/chef/chef/pull/6299) ([stevendanna](https://github.com/stevendanna))
+- Add .dockerignore to reduce size of resulting images [#6296](https://github.com/chef/chef/pull/6296) ([tduffield](https://github.com/tduffield))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- 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 -->
- Apt: Add apt_preference resource from apt cookbooks [#5529](https://github.com/chef/chef/pull/5529) ([tas50](https://github.com/tas50)) <!-- 13.3.29 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 945ca07954..3bff641533 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.31)
+ chef (13.3.32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.31)
+ chef-config (= 13.3.32)
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.31-universal-mingw32)
+ chef (13.3.32-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.31)
+ chef-config (= 13.3.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 (13.3.31)
+ chef-config (13.3.32)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 7e0161a8c7..5290445690 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.31 \ No newline at end of file
+13.3.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 9e8f6c58a8..6860e7172d 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.31"
+ VERSION = "13.3.32"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0d4d2d336a..7f3121c3b5 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.31")
+ VERSION = Chef::VersionString.new("13.3.32")
end
#