summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-05-20 03:01:34 +0000
committerChef Versioner <chef-versioner@chef.io>2017-05-20 03:01:34 +0000
commit5cab1ac5b2b45b426548425ed08d0807ea03e42a (patch)
tree889e6dc0e396b397ddab29a55d2ac461e9f860a0
parent3117600632ecbd2531cee833668de8a5114d6c85 (diff)
downloadchef-lita-acceptance.tar.gz
Bump version of chef to 13.1.21 by Chef Versioner.v13.1.21lita-devlita-acceptance
-rw-r--r--CHANGELOG.md7
-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, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf44f3411..6cc342f854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +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.19](https://github.com/chef/chef/tree/v13.1.19) (2017-05-16)
-[Full Changelog](https://github.com/chef/chef/compare/v13.1.19...v13.1.19)
+## [v13.1.20](https://github.com/chef/chef/tree/v13.1.20) (2017-05-16)
+[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.20)
**Closed issues:**
- Chef 13.0 regression in gem\_package related to finding gem binaries [\#6103](https://github.com/chef/chef/issues/6103)
-## [v13.1.19](https://github.com/chef/chef/tree/v13.1.19) (2017-05-16)
-[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.19)
-
**Merged pull requests:**
- Fixing broken functional test in windows\_task resource [\#6139](https://github.com/chef/chef/pull/6139) ([NimishaS](https://github.com/NimishaS))
diff --git a/Gemfile.lock b/Gemfile.lock
index ae41586d43..827ec8beae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.1.20)
+ chef (13.1.21)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.20)
+ chef-config (= 13.1.21)
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.20-universal-mingw32)
+ chef (13.1.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.1.20)
+ chef-config (= 13.1.21)
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.20)
+ chef-config (13.1.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c5031f470a..e411c2f5a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.20 \ No newline at end of file
+13.1.21 \ 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 1d91375ba7..caa5cf1167 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.20"
+ VERSION = "13.1.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 32633520e6..6bf1fb664b 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.20"
+ VERSION = "13.1.21"
end
#