summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-15 18:15:58 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-15 18:15:58 +0000
commit5991cd84731a5c22e4ad411c38334b506d07ab9a (patch)
tree0c00bfda3f2a5e36a436d7030b904cfadd60dfcb
parent4f790d9ee2d925aa8b92cd2c821eb10cad3b2fa6 (diff)
downloadchef-5991cd84731a5c22e4ad411c38334b506d07ab9a.tar.gz
Bump version to 15.0.69 by Chef Expeditorv15.0.69
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 706dbd2556..60e4df714e 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.68 -->
-## [v15.0.68](https://github.com/chef/chef/tree/v15.0.68) (2018-11-15)
+<!-- latest_release 15.0.69 -->
+## [v15.0.69](https://github.com/chef/chef/tree/v15.0.69) (2018-11-15)
#### Merged Pull Requests
-- Improve resource descriptions for documentation [#7929](https://github.com/chef/chef/pull/7929) ([tas50](https://github.com/tas50))
+- Add additional resource description fields [#7938](https://github.com/chef/chef/pull/7938) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Add additional resource description fields [#7938](https://github.com/chef/chef/pull/7938) ([tas50](https://github.com/tas50)) <!-- 15.0.69 -->
- Improve resource descriptions for documentation [#7929](https://github.com/chef/chef/pull/7929) ([tas50](https://github.com/tas50)) <!-- 15.0.68 -->
- windows_feature_dism: support installed deleted features [#7905](https://github.com/chef/chef/pull/7905) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.0.67 -->
- use --no-tty during apt-keys fro gpg - fixes #7913 [#7914](https://github.com/chef/chef/pull/7914) ([EugenMayer](https://github.com/EugenMayer)) <!-- 15.0.66 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c118d27056..286f124d13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.68)
+ chef (15.0.69)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.68)
+ chef-config (= 15.0.69)
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.68-universal-mingw32)
+ chef (15.0.69-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.68)
+ chef-config (= 15.0.69)
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.68)
+ chef-config (15.0.69)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 73267416bb..c89f10253c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.68 \ No newline at end of file
+15.0.69 \ 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 1a61b184fd..524d048c12 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.68".freeze
+ VERSION = "15.0.69".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 288b0b1adf..cc4647a53f 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.68")
+ VERSION = Chef::VersionString.new("15.0.69")
end
#