summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-19 19:07:48 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-19 19:07:48 +0000
commitc4c8e947260a4370594b04de395689d98db6380e (patch)
tree9757e44eb8ae470fd345c7a5ce685eb3540e0843
parent70bce642073d7753c471b0bb8c69a1819481c3d3 (diff)
downloadchef-15.0.165.tar.gz
Bump version to 15.0.165 by Chef Expeditorv15.0.165
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 6db61f4d48..cd40c7330d 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.164 -->
-## [v15.0.164](https://github.com/chef/chef/tree/v15.0.164) (2019-02-19)
+<!-- latest_release 15.0.165 -->
+## [v15.0.165](https://github.com/chef/chef/tree/v15.0.165) (2019-02-19)
#### Merged Pull Requests
-- Update scripts to use new EXPEDITOR_ environment variables [#8232](https://github.com/chef/chef/pull/8232) ([tduffield](https://github.com/tduffield))
+- chocolatey_package: use provided options when determing available options to allow using private sources [#8230](https://github.com/chef/chef/pull/8230) ([vsingh-msys](https://github.com/vsingh-msys))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- chocolatey_package: use provided options when determing available options to allow using private sources [#8230](https://github.com/chef/chef/pull/8230) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.165 -->
- Update scripts to use new EXPEDITOR_ environment variables [#8232](https://github.com/chef/chef/pull/8232) ([tduffield](https://github.com/tduffield)) <!-- 15.0.164 -->
- windows_certificate: Add support to import Base 64 encoded CER certificates [#8229](https://github.com/chef/chef/pull/8229) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.163 -->
- Chef::Config: Uniform config dir path separator [#8219](https://github.com/chef/chef/pull/8219) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.162 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 82b9e9d446..caca7963db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.164)
+ chef (15.0.165)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.164)
+ chef-config (= 15.0.165)
chef-zero (>= 14.0.11)
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.164-universal-mingw32)
+ chef (15.0.165-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.164)
+ chef-config (= 15.0.165)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.164)
+ chef-config (15.0.165)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 85513a4351..3f76a62ee5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.164 \ No newline at end of file
+15.0.165 \ 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 c507dd66ca..25dfe3d978 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.164".freeze
+ VERSION = "15.0.165".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6cd31bfb36..b63b5c2f44 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.164")
+ VERSION = Chef::VersionString.new("15.0.165")
end
#