summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-04-21 21:43:27 +0000
committerChef Versioner <chef-versioner@chef.io>2017-04-21 21:43:27 +0000
commit873ecbea8deac9a26f99ec3e715bb91e51155f73 (patch)
treecccbf74ffda66de1f4a648eeb1fbca875edcdb20
parent99c4be940b17f77961e1f97ece98d46366c57456 (diff)
downloadchef-13.1.4.tar.gz
Bump version of chef to 13.1.4 by Chef Versioner.v13.1.4
-rw-r--r--CHANGELOG.md12
-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, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ceb4ec28..a525a77011 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,12 @@
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.2](https://github.com/chef/chef/tree/v13.1.2) (2017-04-21)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.2)
+## [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)
**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))
-## [v13.0.118](https://github.com/chef/chef/tree/v13.0.118) (2017-04-12)
-[Full Changelog](https://github.com/chef/chef/compare/v13.1.2...v13.0.118)
-
-**Merged pull requests:**
-
-- Fix some fallout from the options converstion to an array [\#6047](https://github.com/chef/chef/pull/6047) ([coderanger](https://github.com/coderanger))
-- Fix for Chef 13 upload reversion. [\#6045](https://github.com/chef/chef/pull/6045) ([coderanger](https://github.com/coderanger))
-
## [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/Gemfile.lock b/Gemfile.lock
index 0cb350f6e2..2c10a5deda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,10 +96,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.3)
+ chef (13.1.4)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.3)
+ chef-config (= 13.1.4)
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.3-universal-mingw32)
+ chef (13.1.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.3)
+ chef-config (= 13.1.4)
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.3)
+ chef-config (13.1.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 68ac8a21f0..5443013375 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.3 \ No newline at end of file
+13.1.4 \ 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 3258ee1093..857e0207b1 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.3"
+ VERSION = "13.1.4"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 570f8826c6..f7708c0a8f 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.3"
+ VERSION = "13.1.4"
end
#