summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-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, 9 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a48982222..ae8be443e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,5 @@
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.0.117](https://github.com/chef/chef/tree/v13.0.117) (2017-04-12)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.113...v13.0.117)
-
## [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 d18adede4b..8eccfc63e1 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.113
+ARG VERSION=13.0.118
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 12db299c07..49794226fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,10 +96,10 @@ GIT
PATH
remote: .
specs:
- chef (13.0.118)
+ chef (13.0.119)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.118)
+ chef-config (= 13.0.119)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -126,10 +126,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.0.118-universal-mingw32)
+ chef (13.0.119-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.118)
+ chef-config (= 13.0.119)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -171,7 +171,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.0.118)
+ chef-config (13.0.119)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 61dc2d245c..be9b6dc63d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.118 \ No newline at end of file
+13.0.119 \ 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 e5105b657e..b2a0c493bf 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.0.118"
+ VERSION = "13.0.119"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 098751072f..3fc0717e66 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.0.118"
+ VERSION = "13.0.119"
end
#