summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 25487d34fa..c7e9e5cfd1 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.0.19](https://github.com/chef/chef/tree/v13.0.19) (2017-03-08)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.19...v13.0.19)
+## [v13.0.20](https://github.com/chef/chef/tree/v13.0.20) (2017-03-08)
+[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.20)
**Merged pull requests:**
- convert additional resource methods to properties [\#5871](https://github.com/chef/chef/pull/5871) ([lamont-granquist](https://github.com/lamont-granquist))
-## [v13.0.19](https://github.com/chef/chef/tree/v13.0.19) (2017-03-08)
-[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.19)
-
## [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 b69f1e1a85..085f993fd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,10 +113,10 @@ GIT
PATH
remote: .
specs:
- chef (13.0.20)
+ chef (13.0.21)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.20)
+ chef-config (= 13.0.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -142,10 +142,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.0.20-universal-mingw32)
+ chef (13.0.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.20)
+ chef-config (= 13.0.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -186,7 +186,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.0.20)
+ chef-config (13.0.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 91e49b3fb5..f5cc36e291 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.20 \ No newline at end of file
+13.0.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 0600aa326f..4ebf7a81c7 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.20"
+ VERSION = "13.0.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a23d9d0019..237a57bf8d 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.20"
+ VERSION = "13.0.21"
end
#