summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-17 08:49:14 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-17 08:49:14 +0000
commitb7e51206138303e0eaee6b8dee8bb7b863afc33d (patch)
tree82a919526cf1f8a61a7c346dbb7899a7124c3ca4
parent7854fa2b3c0872127899a1aef47878c7b20d060c (diff)
downloadchef-14.6.31.tar.gz
Bump version to 14.6.31 by Chef Expeditorv14.6.31
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 713d58ad49..3201523c22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.30 -->
-## [v14.6.30](https://github.com/chef/chef/tree/v14.6.30) (2018-10-16)
+<!-- latest_release 14.6.31 -->
+## [v14.6.31](https://github.com/chef/chef/tree/v14.6.31) (2018-10-17)
#### Merged Pull Requests
-- Run more Travis tests on Ruby 2.5.1 [#7755](https://github.com/chef/chef/pull/7755) ([tas50](https://github.com/tas50))
+- Add support for localized system account to windows_task resource [#7679](https://github.com/chef/chef/pull/7679) ([jugatsu](https://github.com/jugatsu))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Add support for localized system account to windows_task resource [#7679](https://github.com/chef/chef/pull/7679) ([jugatsu](https://github.com/jugatsu)) <!-- 14.6.31 -->
- Run more Travis tests on Ruby 2.5.1 [#7755](https://github.com/chef/chef/pull/7755) ([tas50](https://github.com/tas50)) <!-- 14.6.30 -->
- File provider: fix sticky bits management / preservation [#7753](https://github.com/chef/chef/pull/7753) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.29 -->
- Node Attributes: Build ImmutableMash properly in deep_merge! [#7752](https://github.com/chef/chef/pull/7752) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.28 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 92fb27d54f..7b1635606e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.30)
+ chef (14.6.31)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.30)
+ chef-config (= 14.6.31)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.30-universal-mingw32)
+ chef (14.6.31-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.30)
+ chef-config (= 14.6.31)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.30)
+ chef-config (14.6.31)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 6019b1abb6..09be8f08f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.30 \ No newline at end of file
+14.6.31 \ 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 816627e4a4..c7e0985eeb 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.6.30".freeze
+ VERSION = "14.6.31".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b07e90e3c2..10b6582e38 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.6.30")
+ VERSION = Chef::VersionString.new("14.6.31")
end
#