summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-05-15 09:12:14 +0000
committerChef Versioner <chef-versioner@chef.io>2017-05-15 09:12:14 +0000
commit013d559b186e760f1f478180a15a5289f49e4849 (patch)
tree3f5435a17967d18d4ec673716e53d3f673c96225
parent7ba8a5160d76d40ad67557c9b63965653d190dcc (diff)
downloadchef-013d559b186e760f1f478180a15a5289f49e4849.tar.gz
Bump version of chef to 13.1.18 by Chef Versioner.v13.1.18
-rw-r--r--CHANGELOG.md4
-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, 10 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd04ce5d2..c6a6225987 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.16](https://github.com/chef/chef/tree/v13.1.16) (2017-05-12)
-[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.16)
+## [v13.1.17](https://github.com/chef/chef/tree/v13.1.17) (2017-05-12)
+[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.17)
**Merged pull requests:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 1617aa5a35..7082bddbd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.17)
+ chef (13.1.18)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.17)
+ chef-config (= 13.1.18)
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.17-universal-mingw32)
+ chef (13.1.18-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.17)
+ chef-config (= 13.1.18)
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.17)
+ chef-config (13.1.18)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 08890d79bd..b0e59ec343 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.17 \ No newline at end of file
+13.1.18 \ 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 2e20e833a9..e5605bc770 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.17"
+ VERSION = "13.1.18"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e3a5f8229d..c89bd9ec4e 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.17"
+ VERSION = "13.1.18"
end
#