summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-05-02 22:59:12 +0000
committerChef Versioner <chef-versioner@chef.io>2017-05-02 22:59:12 +0000
commit9c86d2b41f6373b1c2d891a3d2117ba318a78d40 (patch)
tree56793a434b879de27a8f35964cbe14c9a5bd826f
parentb2abfa294eb51775885657230b6a32485d2634f1 (diff)
downloadchef-9c86d2b41f6373b1c2d891a3d2117ba318a78d40.tar.gz
Bump version of chef to 13.1.8 by Chef Versioner.v13.1.8
-rw-r--r--CHANGELOG.md8
-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, 11 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 917704e334..a649ae83fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +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.6](https://github.com/chef/chef/tree/v13.1.6) (2017-04-26)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.6)
-
-**Merged pull requests:**
-
-- add a pointer from the run\_context back to the runner [\#6077](https://github.com/chef/chef/pull/6077) ([lamont-granquist](https://github.com/lamont-granquist))
+## [v12.20.3](https://github.com/chef/chef/tree/v12.20.3) (2017-04-30)
+[Full Changelog](https://github.com/chef/chef/compare/v13.1.7...v12.20.3)
## [v12.19.33](https://github.com/chef/chef/tree/v12.19.33) (2017-02-16)
[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.33)
diff --git a/Dockerfile b/Dockerfile
index 8eccfc63e1..5bb2a542a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=13.0.118
+ARG VERSION=12.20.3
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 c43a4cc286..7e1e1aa521 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.7)
+ chef (13.1.8)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.7)
+ chef-config (= 13.1.8)
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.7-universal-mingw32)
+ chef (13.1.8-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.7)
+ chef-config (= 13.1.8)
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.7)
+ chef-config (13.1.8)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 80e13153aa..5db74606ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.7 \ No newline at end of file
+13.1.8 \ 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 00aeb7a811..3fdadf8b54 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.7"
+ VERSION = "13.1.8"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2e8b54ac65..ab35c5dda9 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.1.7"
+ VERSION = "13.1.8"
end
#