summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-03-04 19:23:07 +0000
committerChef Expeditor <chef-ci@chef.io>2019-03-04 19:23:07 +0000
commit5153da36dc098989980c05361e5436317d2511fd (patch)
tree19faaff4f795f96bc96b8b4876e2ea36a7574fb7
parent7685df5fb6b2b9f1947970d34ed959730843006b (diff)
downloadchef-5153da36dc098989980c05361e5436317d2511fd.tar.gz
Bump version to 14.11.18 by Chef Expeditorv14.11.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 0f54cb2e3b..d7953bba12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.11.17 -->
-## [v14.11.17](https://github.com/chef/chef/tree/v14.11.17) (2019-03-04)
+<!-- latest_release 14.11.18 -->
+## [v14.11.18](https://github.com/chef/chef/tree/v14.11.18) (2019-03-04)
#### Merged Pull Requests
-- windows_certificate: Add support to import Base 64 encoded CER certificates [#8267](https://github.com/chef/chef/pull/8267) ([tas50](https://github.com/tas50))
+- Update InSpec to 3.7.1 [#8268](https://github.com/chef/chef/pull/8268) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.10.9 -->
### Changes since 14.10.9 release
#### Merged Pull Requests
+- Update InSpec to 3.7.1 [#8268](https://github.com/chef/chef/pull/8268) ([tas50](https://github.com/tas50)) <!-- 14.11.18 -->
- windows_certificate: Add support to import Base 64 encoded CER certificates [#8267](https://github.com/chef/chef/pull/8267) ([tas50](https://github.com/tas50)) <!-- 14.11.17 -->
- Update openssl to 1.0.2r [#8266](https://github.com/chef/chef/pull/8266) ([tas50](https://github.com/tas50)) <!-- 14.11.16 -->
- More consist descriptions for resource name properties [#8265](https://github.com/chef/chef/pull/8265) ([tas50](https://github.com/tas50)) <!-- 14.11.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 389514bc61..336fbc7391 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.17)
+ chef (14.11.18)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.17)
+ chef-config (= 14.11.18)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.11.17-universal-mingw32)
+ chef (14.11.18-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.17)
+ chef-config (= 14.11.18)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -78,7 +78,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.11.17)
+ chef-config (14.11.18)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index b9aabf84a5..edcacaa455 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.17 \ No newline at end of file
+14.11.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 4b35d1c423..39a9ebdb88 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 = "14.11.17".freeze
+ VERSION = "14.11.18".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 667f3b034e..1b103326e2 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("14.11.17")
+ VERSION = Chef::VersionString.new("14.11.18")
end
#