summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-06 00:00:32 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-06 00:00:32 +0000
commite45fa7b014b7fccbcc8c62d3881214101ff98a04 (patch)
tree9676339b52744de4bb9fb33baec695e0c9adcc02
parent84f5701ba2aaf7df72638a9a14d88beb28fe13f0 (diff)
downloadchef-e45fa7b014b7fccbcc8c62d3881214101ff98a04.tar.gz
Bump version to 14.11.1 by Chef Expeditorv14.11.1
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 83296f8eb8..99942a1278 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.0 -->
-## [v14.11.0](https://github.com/chef/chef/tree/v14.11.0) (2019-02-05)
+<!-- latest_release 14.11.1 -->
+## [v14.11.1](https://github.com/chef/chef/tree/v14.11.1) (2019-02-06)
#### Merged Pull Requests
-- Update rubygems to 2.7.8 and bundler to 1.17.3 [#8194](https://github.com/chef/chef/pull/8194) ([tas50](https://github.com/tas50))
+- windows_certificate: Import PFX certificates with their private keys [#8206](https://github.com/chef/chef/pull/8206) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.10.9 -->
### Changes since 14.10.9 release
#### Merged Pull Requests
+- windows_certificate: Import PFX certificates with their private keys [#8206](https://github.com/chef/chef/pull/8206) ([tas50](https://github.com/tas50)) <!-- 14.11.1 -->
- Update rubygems to 2.7.8 and bundler to 1.17.3 [#8194](https://github.com/chef/chef/pull/8194) ([tas50](https://github.com/tas50)) <!-- 14.11.0 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 05eb8ec1b9..75e3242ea6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.0)
+ chef (14.11.1)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.0)
+ chef-config (= 14.11.1)
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.0-universal-mingw32)
+ chef (14.11.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.0)
+ chef-config (= 14.11.1)
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.0)
+ chef-config (14.11.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index e05edc3293..208954718e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.0 \ No newline at end of file
+14.11.1 \ 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 f967f67d68..4000e6fcf8 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.0".freeze
+ VERSION = "14.11.1".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e18d7e8c98..f3f67b088c 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.0")
+ VERSION = Chef::VersionString.new("14.11.1")
end
#