summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-05 23:51:36 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-05 23:51:36 +0000
commitdc0378d8307ad5b553fa144bd586ebd426ab7b3e (patch)
treedb16c6c195e68bb226c2775aeaee3d78a1042a70
parentfd764dff9f1cdaa1970aa4b10e8890a656175939 (diff)
downloadchef-15.0.155.tar.gz
Bump version to 15.0.155 by Chef Expeditorv15.0.155
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 ca0f9f81b3..8815484a3c 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.154 -->
-## [v15.0.154](https://github.com/chef/chef/tree/v15.0.154) (2019-02-05)
+<!-- latest_release 15.0.155 -->
+## [v15.0.155](https://github.com/chef/chef/tree/v15.0.155) (2019-02-05)
#### Merged Pull Requests
-- chef-solo: Fixes for extra cookbook_path with parent dir that doesn&#39;t exist causes crash [#8202](https://github.com/chef/chef/pull/8202) ([vsingh-msys](https://github.com/vsingh-msys))
+- powershell_script: Prefer user provided flags over the defaults [#8167](https://github.com/chef/chef/pull/8167) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- powershell_script: Prefer user provided flags over the defaults [#8167](https://github.com/chef/chef/pull/8167) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.155 -->
- chef-solo: Fixes for extra cookbook_path with parent dir that doesn&#39;t exist causes crash [#8202](https://github.com/chef/chef/pull/8202) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.154 -->
- windows_task: Properly set command / argumentts so resource updates behave as expected [#8201](https://github.com/chef/chef/pull/8201) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.153 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 67c2a8e0ee..e7dc83803e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.154)
+ chef (15.0.155)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.154)
+ chef-config (= 15.0.155)
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.154-universal-mingw32)
+ chef (15.0.155-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.154)
+ chef-config (= 15.0.155)
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.154)
+ chef-config (15.0.155)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index e1a1eae564..dd96f0581c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.154 \ No newline at end of file
+15.0.155 \ 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 d80a5d2972..c3525004ba 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.154".freeze
+ VERSION = "15.0.155".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3050ebd44f..5a37f6e0fc 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.154")
+ VERSION = Chef::VersionString.new("15.0.155")
end
#