summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-03-17 13:37:34 +0000
committerChef Versioner <chef-versioner@chef.io>2017-03-17 13:37:34 +0000
commitfdcd4a67a55b27eea7c798539c918c57df5cf1f6 (patch)
tree8e45460fa7ce3a861c7af952db640a89bb937118
parentf866472404105f3e109de84202826cae547712d2 (diff)
downloadchef-fdcd4a67a55b27eea7c798539c918c57df5cf1f6.tar.gz
Bump version of chef to 13.0.48 by Chef Versioner.v13.0.48
-rw-r--r--CHANGELOG.md11
-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, 17 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca81ab9d59..bc0611e882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,14 @@
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.46](https://github.com/chef/chef/tree/v13.0.46) (2017-03-16)
-[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.46)
+## [v13.0.47](https://github.com/chef/chef/tree/v13.0.47) (2017-03-17)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.47...v13.0.47)
+
+**Merged pull requests:**
+
+- Jeremymv2/cheffs optimizations [\#5890](https://github.com/chef/chef/pull/5890) ([jeremymv2](https://github.com/jeremymv2))
+
+## [v13.0.47](https://github.com/chef/chef/tree/v13.0.47) (2017-03-17)
+[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.47)
**Closed issues:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 41455108bc..413fb592eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,10 +113,10 @@ GIT
PATH
remote: .
specs:
- chef (13.0.47)
+ chef (13.0.48)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.47)
+ chef-config (= 13.0.48)
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.47-universal-mingw32)
+ chef (13.0.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.47)
+ chef-config (= 13.0.48)
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.47)
+ chef-config (13.0.48)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 720719d048..b42014f8f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.47 \ No newline at end of file
+13.0.48 \ 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 13c18c08c0..6934930758 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.47"
+ VERSION = "13.0.48"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index be0c482fbb..3548cef102 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.47"
+ VERSION = "13.0.48"
end
#