summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-04 18:53:59 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-04 18:53:59 +0000
commit0e0c8978eb9d35d26208432606fa5699da4294d0 (patch)
tree2ed0ede721c75ffa5a517c0664a111258d899a5b
parentefd1e2a829db98d5ccbec5b19f8a7700eb9a2c69 (diff)
downloadchef-15.0.152.tar.gz
Bump version to 15.0.152 by Chef Expeditorv15.0.152
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 2ad0d73478..0f80722842 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.151 -->
-## [v15.0.151](https://github.com/chef/chef/tree/v15.0.151) (2019-01-31)
+<!-- latest_release 15.0.152 -->
+## [v15.0.152](https://github.com/chef/chef/tree/v15.0.152) (2019-02-04)
#### Merged Pull Requests
-- Convert execute_resource remaining properties to use properties [#8178](https://github.com/chef/chef/pull/8178) ([Vasu1105](https://github.com/Vasu1105))
+- windows_certificate: Import PFX certificates with their private keys [#8193](https://github.com/chef/chef/pull/8193) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- windows_certificate: Import PFX certificates with their private keys [#8193](https://github.com/chef/chef/pull/8193) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.152 -->
- Convert execute_resource remaining properties to use properties [#8178](https://github.com/chef/chef/pull/8178) ([Vasu1105](https://github.com/Vasu1105)) <!-- 15.0.151 -->
- Update knife bootstrap template to use up to date omnitruck URL [#8190](https://github.com/chef/chef/pull/8190) ([mivok](https://github.com/mivok)) <!-- 15.0.150 -->
- git: Don&#39;t display the repo URL when sensitive property is set [#8179](https://github.com/chef/chef/pull/8179) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 15.0.149 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a59054c03..b74175b776 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.151)
+ chef (15.0.152)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.151)
+ chef-config (= 15.0.152)
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.151-universal-mingw32)
+ chef (15.0.152-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.151)
+ chef-config (= 15.0.152)
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.151)
+ chef-config (15.0.152)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index a69d4361d7..09e364a335 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.151 \ No newline at end of file
+15.0.152 \ 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 a9753810ff..bd5ac73835 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.151".freeze
+ VERSION = "15.0.152".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 43a09faa56..77223dde49 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.151")
+ VERSION = Chef::VersionString.new("15.0.152")
end
#