summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-delivery@chef.io>2017-07-05 20:13:53 +0000
committerChef Expeditor <eng-services-ops+chef-delivery@chef.io>2017-07-05 20:13:53 +0000
commitc1a8cfe00daab53c0b9c96e2b759d47aec4af22c (patch)
tree94a8adb242cb165b165d3a98a54770e932c73b98
parentae4d04bbe366199e4597b375b43c254d0117c989 (diff)
downloadchef-c1a8cfe00daab53c0b9c96e2b759d47aec4af22c.tar.gz
Bump version of chef to 13.2.22 by Chef Expeditor.v13.2.22
-rw-r--r--CHANGELOG.md5
-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.rb2
6 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ebe7cb9dc..40c2576f03 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.2.21](https://github.com/chef/chef/tree/v13.2.21) (2017-06-30)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.2.21)
+## [v13.2.22](https://github.com/chef/chef/tree/v13.2.22) (2017-07-05)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.2.22)
**Closed issues:**
@@ -9,6 +9,7 @@ This changelog reflects the current state of chef's master branch on github and
**Merged pull requests:**
+- \[MSYS-590\]Make mount idempotent on Aix [\#6213](https://github.com/chef/chef/pull/6213) ([NAshwini](https://github.com/NAshwini))
- Use socketless local mode by default [\#6177](https://github.com/chef/chef/pull/6177) ([coderanger](https://github.com/coderanger))
- convert breakpoint resource to a custom resource [\#6176](https://github.com/chef/chef/pull/6176) ([lamont-granquist](https://github.com/lamont-granquist))
- Make non-legacy solo use socketless mode [\#6174](https://github.com/chef/chef/pull/6174) ([coderanger](https://github.com/coderanger))
diff --git a/Dockerfile b/Dockerfile
index 3d0227c94b..4befc17d39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=13.1.31
+ARG VERSION=13.2.20
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 630c5d07ee..5dc6aff4da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.2.21)
+ chef (13.2.22)
addressable
bundler (>= 1.10)
- chef-config (= 13.2.21)
+ chef-config (= 13.2.22)
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.2.21-universal-mingw32)
+ chef (13.2.22-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.2.21)
+ chef-config (= 13.2.22)
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.2.21)
+ chef-config (13.2.22)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 2d9f4a6e3f..e3243004fe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.21 \ No newline at end of file
+13.2.22 \ 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 1fec06eefd..7665c4ed94 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.2.21"
+ VERSION = "13.2.22"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7353402804..bd5874354b 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("13.2.21")
+ VERSION = Chef::VersionString.new("13.2.22")
end
#