summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-31 02:10:22 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-31 02:10:22 +0000
commit60f6b36f0f8b8bfe94ec8bf01a02c865912cd0bd (patch)
treee0fce6b922077ccadf9d331cb650955a22e4ff17
parent778cafa101d9f4c7480aa2c70244cadfcdf4421f (diff)
downloadchef-60f6b36f0f8b8bfe94ec8bf01a02c865912cd0bd.tar.gz
Bump version to 15.0.18 by Chef Expeditorv15.0.18
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 6a7db0b8a8..1cb58037cb 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.17 -->
-## [v15.0.17](https://github.com/chef/chef/tree/v15.0.17) (2018-10-31)
+<!-- latest_release 15.0.18 -->
+## [v15.0.18](https://github.com/chef/chef/tree/v15.0.18) (2018-10-31)
#### Merged Pull Requests
-- Update win32-certstore to include a license [#7822](https://github.com/chef/chef/pull/7822) ([tas50](https://github.com/tas50))
+- Fix testing / installing on SLES 15 [#7819](https://github.com/chef/chef/pull/7819) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Fix testing / installing on SLES 15 [#7819](https://github.com/chef/chef/pull/7819) ([tas50](https://github.com/tas50)) <!-- 15.0.18 -->
- Update win32-certstore to include a license [#7822](https://github.com/chef/chef/pull/7822) ([tas50](https://github.com/tas50)) <!-- 15.0.17 -->
- Add windows_certificate and windows_share resources [#7731](https://github.com/chef/chef/pull/7731) ([tas50](https://github.com/tas50)) <!-- 15.0.16 -->
- Remove unused route resource properties [#7240](https://github.com/chef/chef/pull/7240) ([tas50](https://github.com/tas50)) <!-- 15.0.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7262e60fb2..b8078c8017 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.17)
+ chef (15.0.18)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.17)
+ chef-config (= 15.0.18)
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.17-universal-mingw32)
+ chef (15.0.18-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.17)
+ chef-config (= 15.0.18)
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.17)
+ chef-config (15.0.18)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index e63595d7c0..75ca2af379 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.17 \ No newline at end of file
+15.0.18 \ 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 c1e5b5c8f9..dd011b1ca3 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.17".freeze
+ VERSION = "15.0.18".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0d5b38d975..b53e90f4da 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.17")
+ VERSION = Chef::VersionString.new("15.0.18")
end
#