summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-19 18:17:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-19 18:17:03 +0000
commitfc813e21f253d5278cb42710874a34cfebfcc8ca (patch)
tree03edef0310719e22769f38982a63c92fb011188e
parent01a801e1caa39a8aee63c569d2c6df41c59da1f7 (diff)
downloadchef-fc813e21f253d5278cb42710874a34cfebfcc8ca.tar.gz
Bump version to 13.6.47 by Expeditorv13.6.47
-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, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab3abd0acc..073fcb2261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.46 -->
-## [v13.6.46](https://github.com/chef/chef/tree/v13.6.46) (2017-12-19)
+<!-- latest_release 13.6.47 -->
+## [v13.6.47](https://github.com/chef/chef/tree/v13.6.47) (2017-12-19)
#### Merged Pull Requests
-- Modernize the ifconfig resource [#6684](https://github.com/chef/chef/pull/6684) ([tas50](https://github.com/tas50))
+- Modernize directory resource [#6693](https://github.com/chef/chef/pull/6693) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Modernize directory resource [#6693](https://github.com/chef/chef/pull/6693) ([tas50](https://github.com/tas50)) <!-- 13.6.47 -->
- Modernize the ifconfig resource [#6684](https://github.com/chef/chef/pull/6684) ([tas50](https://github.com/tas50)) <!-- 13.6.46 -->
- Slight improvements to validation failures [#6690](https://github.com/chef/chef/pull/6690) ([thommay](https://github.com/thommay)) <!-- 13.6.45 -->
- Modernize osx_profile resource [#6685](https://github.com/chef/chef/pull/6685) ([tas50](https://github.com/tas50)) <!-- 13.6.44 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c34123b53d..57570ad69e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.46)
+ chef (13.6.47)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.46)
+ chef-config (= 13.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.46-universal-mingw32)
+ chef (13.6.47-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.46)
+ chef-config (= 13.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.46)
+ chef-config (13.6.47)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e6e9a44c62..60bdc54dfe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.46 \ No newline at end of file
+13.6.47 \ 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 4db05f4c92..12d4d9766b 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.6.46"
+ VERSION = "13.6.47"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d1ccd6ff97..969ff11ed1 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.6.46")
+ VERSION = Chef::VersionString.new("13.6.47")
end
#