summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-22 12:31:23 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-22 12:31:23 +0000
commitb66fbf5ebf9938c9b1706f837027ffab3938f4a9 (patch)
tree2b9defcd6b2e21998cff1e18f8e356bc9cf3ef65
parentca49513fdbdd2b8d964028cf3808838644cd6b10 (diff)
downloadchef-b66fbf5ebf9938c9b1706f837027ffab3938f4a9.tar.gz
Bump version to 15.0.84 by Chef Expeditorv15.0.84
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 b95f155d01..f1301eb889 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.83 -->
-## [v15.0.83](https://github.com/chef/chef/tree/v15.0.83) (2018-11-20)
+<!-- latest_release 15.0.84 -->
+## [v15.0.84](https://github.com/chef/chef/tree/v15.0.84) (2018-11-22)
#### Merged Pull Requests
-- need -rf to remove dirs [#7966](https://github.com/chef/chef/pull/7966) ([lamont-granquist](https://github.com/lamont-granquist))
+- windows_share: Avoid ConvertTo-Json errors on Windows 2012r2 with powershell 4 [#7961](https://github.com/chef/chef/pull/7961) ([derekgroh](https://github.com/derekgroh))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- windows_share: Avoid ConvertTo-Json errors on Windows 2012r2 with powershell 4 [#7961](https://github.com/chef/chef/pull/7961) ([derekgroh](https://github.com/derekgroh)) <!-- 15.0.84 -->
- need -rf to remove dirs [#7966](https://github.com/chef/chef/pull/7966) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.83 -->
- wipe the installer direction before installation [#7964](https://github.com/chef/chef/pull/7964) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.82 -->
- windows_share: Accounts to be revoked should be provided as an individually quoted string array [#7959](https://github.com/chef/chef/pull/7959) ([stuartpreston](https://github.com/stuartpreston)) <!-- 15.0.81 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6170c34af3..ceebad6b7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.83)
+ chef (15.0.84)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.83)
+ chef-config (= 15.0.84)
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.83-universal-mingw32)
+ chef (15.0.84-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.83)
+ chef-config (= 15.0.84)
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.83)
+ chef-config (15.0.84)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 5c3cbd6701..e0317f8c26 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.83 \ No newline at end of file
+15.0.84 \ 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 f407773702..488b708ab0 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.83".freeze
+ VERSION = "15.0.84".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6ee94261a6..23ee87e380 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.83")
+ VERSION = Chef::VersionString.new("15.0.84")
end
#