summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-05-31 01:35:07 +0000
committerChef Versioner <chef-versioner@chef.io>2017-05-31 01:35:07 +0000
commitb6c7aae1a370770e23b3fa330a86eeffacc4a9a3 (patch)
tree0a028e46a77a5f62a5b55d2a42933b93706076bf
parentbce1285acb6e58e2cbedc047243e4f0576c8f1b8 (diff)
downloadchef-b6c7aae1a370770e23b3fa330a86eeffacc4a9a3.tar.gz
Bump version of chef to 13.1.33 by Chef Versioner.v13.1.33
-rw-r--r--CHANGELOG.md4
-rw-r--r--Dockerfile2
-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.rb4
6 files changed, 12 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2092f9432..981c705e8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v13.1.31](https://github.com/chef/chef/tree/v13.1.31) (2017-05-26)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.31)
+## [v13.1.32](https://github.com/chef/chef/tree/v13.1.32) (2017-05-26)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.32)
**Closed issues:**
diff --git a/Dockerfile b/Dockerfile
index 5bb2a542a9..3d0227c94b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=12.20.3
+ARG VERSION=13.1.31
RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/5/chef-${VERSION}-1.el5.x86_64.rpm" -O /tmp/chef-client.rpm && \
rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \
diff --git a/Gemfile.lock b/Gemfile.lock
index 7674e6e64a..bcc607fe9b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.32)
+ chef (13.1.33)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.32)
+ chef-config (= 13.1.33)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -60,10 +60,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.1.32-universal-mingw32)
+ chef (13.1.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.32)
+ chef-config (= 13.1.33)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -105,7 +105,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.1.32)
+ chef-config (13.1.33)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 35b4aa0382..3fe9470244 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.32 \ No newline at end of file
+13.1.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 b44e35e8f1..57613358a7 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 = "13.1.32"
+ VERSION = "13.1.33"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 44596e20da..eb642a61d2 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -19,11 +19,11 @@
# task instead.
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-require "chef/version_string"
+require 'chef/version_string'
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.1.32")
+ VERSION = Chef::VersionString.new("13.1.33")
end
#