summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-17 16:21:23 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-17 16:21:23 +0000
commitea3da8c4703fd3d170340f56c11b5d88930085aa (patch)
tree7827df689202693409fe455f74d4d95593b6d85f
parent80d0ffbe4f52ad7f01907f839b0f929d5ae9cca8 (diff)
downloadchef-ea3da8c4703fd3d170340f56c11b5d88930085aa.tar.gz
Bump version to 13.3.48 by Chef Expeditorv13.3.48
-rw-r--r--CHANGELOG.md9
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcb5ce4fae..6cd0f121a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.3.47 -->
-## [v13.3.47](https://github.com/chef/chef/tree/v13.3.47) (2017-08-16)
+<!-- latest_release 13.3.48 -->
+## [v13.3.48](https://github.com/chef/chef/tree/v13.3.48) (2017-08-17)
-#### Bug Fixes
-- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm))
+#### Merged Pull Requests
+- Add windows_path resource from the Windows cookbook [#6295](https://github.com/chef/chef/pull/6295) ([NimishaS](https://github.com/NimishaS))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -12,6 +12,7 @@
- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 -->
#### Merged Pull Requests
+- Add windows_path resource from the Windows cookbook [#6295](https://github.com/chef/chef/pull/6295) ([NimishaS](https://github.com/NimishaS)) <!-- 13.3.48 -->
- Add more items to the 13.3 release notes [#6325](https://github.com/chef/chef/pull/6325) ([tas50](https://github.com/tas50)) <!-- 13.3.43 -->
- Fix bad examples in the release notes [#6326](https://github.com/chef/chef/pull/6326) ([tas50](https://github.com/tas50)) <!-- 13.3.44 -->
- Catch Chef 12 changelog up to current 12 release [#6327](https://github.com/chef/chef/pull/6327) ([tas50](https://github.com/tas50)) <!-- 13.3.45 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fc0a094749..fbd66b9e28 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.47)
+ chef (13.3.48)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.47)
+ chef-config (= 13.3.48)
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.3.47-universal-mingw32)
+ chef (13.3.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.47)
+ chef-config (= 13.3.48)
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.3.47)
+ chef-config (13.3.48)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index db6914fc5e..1445a41e11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.47 \ No newline at end of file
+13.3.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 9552a5002b..c417a5f55e 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.47"
+ VERSION = "13.3.48"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index fa9eab78da..8d9e65deb8 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.47")
+ VERSION = Chef::VersionString.new("13.3.48")
end
#