summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-01-25 01:26:53 +0000
committerChef Versioner <chef-versioner@chef.io>2017-01-25 01:26:53 +0000
commit7eb25ecc82dd4737c3397c5fa421ee909a969725 (patch)
tree13bdd817d7b143ebac2944206cabcdcacdc827f2
parentb20c106d73d4351ac0a42c447a4093b03a8349b1 (diff)
downloadchef-7eb25ecc82dd4737c3397c5fa421ee909a969725.tar.gz
Bump version of chef to 12.18.53 by Chef Versioner.v12.18.53
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 947d0cf500..0b9a885a2f 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).
-## [v12.18.52](https://github.com/chef/chef/tree/v12.18.52) (2017-01-24)
-[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.18.52)
+## [v12.18.53](https://github.com/chef/chef/tree/v12.18.53) (2017-01-25)
+[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.18.53)
**Implemented enhancements:**
@@ -12,6 +12,7 @@ This changelog reflects the current state of chef's master branch on github and
**Fixed bugs:**
+- favor metadata.json over metadata.rb [\#5750](https://github.com/chef/chef/pull/5750) ([lamont-granquist](https://github.com/lamont-granquist))
- Ensure ssh search paginates correctly [\#5744](https://github.com/chef/chef/pull/5744) ([thommay](https://github.com/thommay))
- Do not modify File's new\_resource during why-run [\#5742](https://github.com/chef/chef/pull/5742) ([scottopherson](https://github.com/scottopherson))
- Add gems for ECC algorithm support to omnibus. [\#5736](https://github.com/chef/chef/pull/5736) ([rhass](https://github.com/rhass))
diff --git a/Gemfile.lock b/Gemfile.lock
index 086d6ae6f5..54db098578 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.52)
+ chef (12.18.53)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.52)
+ chef-config (= 12.18.53)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.18.52-universal-mingw32)
+ chef (12.18.53-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.52)
+ chef-config (= 12.18.53)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.18.52)
+ chef-config (12.18.53)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6a4c56091e..71d71d5a7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.52 \ No newline at end of file
+12.18.53 \ 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 8d9bf1ebb3..24fa554b9e 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 = "12.18.52"
+ VERSION = "12.18.53"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3f91c89cee..2bacb551ed 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.18.52"
+ VERSION = "12.18.53"
end
#