summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-04-22 09:06:51 +0000
committerChef Versioner <chef-versioner@chef.io>2017-04-22 09:06:51 +0000
commit71863634ac50dbfb2601de536828b779517066ae (patch)
tree74530b4379e96ad2cac844afb3e12a7b6f6500d7
parenteb75759e2662882d103b8d0f0e9b4581540e0367 (diff)
downloadchef-71863634ac50dbfb2601de536828b779517066ae.tar.gz
Bump version of chef to 13.1.5 by Chef Versioner.v13.1.5
-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 a525a77011..c4303af843 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.3](https://github.com/chef/chef/tree/v13.1.3) (2017-04-21)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.3)
+## [v13.1.4](https://github.com/chef/chef/tree/v13.1.4) (2017-04-21)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.4)
**Merged pull requests:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c10a5deda..bc7b08fcbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,10 +96,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.4)
+ chef (13.1.5)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.4)
+ chef-config (= 13.1.5)
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.1.4-universal-mingw32)
+ chef (13.1.5-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.4)
+ chef-config (= 13.1.5)
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.1.4)
+ chef-config (13.1.5)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 5443013375..4f20b443f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.4 \ No newline at end of file
+13.1.5 \ 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 857e0207b1..c924a49a1d 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.4"
+ VERSION = "13.1.5"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f7708c0a8f..d9a9452749 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.4"
+ VERSION = "13.1.5"
end
#