summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-06 22:41:45 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-06 22:41:45 +0000
commit79619e0296294e5d01fc2c5afb4047d87fe800b0 (patch)
treebddcd0a325e9728e1e5c29a75e617e5a86ce9287
parent7a526dc552127407a01f47df27d9eae949b886b6 (diff)
downloadchef-79619e0296294e5d01fc2c5afb4047d87fe800b0.tar.gz
Bump version to 15.0.48 by Chef Expeditorv15.0.48
Obvious fix; these changes are the result of automation not creative thinking.
-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 03a58e4dcd..b1dda5ba33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.47 -->
-## [v15.0.47](https://github.com/chef/chef/tree/v15.0.47) (2018-11-06)
+<!-- latest_release 15.0.48 -->
+## [v15.0.48](https://github.com/chef/chef/tree/v15.0.48) (2018-11-06)
#### Merged Pull Requests
-- resource inspector: don&#39;t convert nil to &quot;nil&quot; in default values [#7880](https://github.com/chef/chef/pull/7880) ([tas50](https://github.com/tas50))
+- Add additional descriptions to resource and update others [#7881](https://github.com/chef/chef/pull/7881) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Add additional descriptions to resource and update others [#7881](https://github.com/chef/chef/pull/7881) ([tas50](https://github.com/tas50)) <!-- 15.0.48 -->
- resource inspector: don&#39;t convert nil to &quot;nil&quot; in default values [#7880](https://github.com/chef/chef/pull/7880) ([tas50](https://github.com/tas50)) <!-- 15.0.47 -->
- Defer running initramfs_command until end of run [#7871](https://github.com/chef/chef/pull/7871) ([tomdoherty](https://github.com/tomdoherty)) <!-- 15.0.45 -->
- Fully remove knife cookbook create command [#7852](https://github.com/chef/chef/pull/7852) ([tas50](https://github.com/tas50)) <!-- 15.0.42 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e2bc2e3082..2b800cdc2a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.47)
+ chef (15.0.48)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.47)
+ chef-config (= 15.0.48)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.47-universal-mingw32)
+ chef (15.0.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.47)
+ chef-config (= 15.0.48)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.47)
+ chef-config (15.0.48)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index bbc31afb84..be56aa17c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.47 \ No newline at end of file
+15.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 77495d65cc..1650e91b8e 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 = "15.0.47".freeze
+ VERSION = "15.0.48".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index dc85607aae..2182079892 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("15.0.47")
+ VERSION = Chef::VersionString.new("15.0.48")
end
#