summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-26 20:12:06 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-26 20:12:06 +0000
commitfb4f7f796b23ad27e6de5c9e6cabf442bc8891f0 (patch)
tree22986a4966c9f0ef9c85496c8526e4f56fd062d4
parentdef7b6fbf871de2a4d24f8860e59d3487f69eb18 (diff)
downloadchef-fb4f7f796b23ad27e6de5c9e6cabf442bc8891f0.tar.gz
Bump version to 14.0.85 by Expeditorv14.0.85
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd560747c2..a591c23a98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.84 -->
-## [v14.0.84](https://github.com/chef/chef/tree/v14.0.84) (2018-02-26)
+<!-- latest_release 14.0.85 -->
+## [v14.0.85](https://github.com/chef/chef/tree/v14.0.85) (2018-02-26)
#### Merged Pull Requests
-- surface default guard interpreter errors [#5972](https://github.com/chef/chef/pull/5972) ([nathwill](https://github.com/nathwill))
+- Add windows auto_run, font, pagefile, printer, printer_port, and shortcut resources [#6767](https://github.com/chef/chef/pull/6767) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Add windows auto_run, font, pagefile, printer, printer_port, and shortcut resources [#6767](https://github.com/chef/chef/pull/6767) ([tas50](https://github.com/tas50)) <!-- 14.0.85 -->
- surface default guard interpreter errors [#5972](https://github.com/chef/chef/pull/5972) ([nathwill](https://github.com/nathwill)) <!-- 14.0.84 -->
- Add more introduced and description fields to resources [#6899](https://github.com/chef/chef/pull/6899) ([tas50](https://github.com/tas50)) <!-- 14.0.83 -->
- Convert parts of cron resource to use properties [#6904](https://github.com/chef/chef/pull/6904) ([tas50](https://github.com/tas50)) <!-- 14.0.82 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 769520e2b5..fba06f1e72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: d54e83f09ffa00d5b4c8aa3bcb2b0a14f7268347
+ revision: d912c89946f9e550c1cd48bb7e10153b9fa94f6f
branch: master
specs:
- ohai (14.0.13)
+ ohai (14.0.14)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.84)
+ chef (14.0.85)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.84)
+ chef-config (= 14.0.85)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.84-universal-mingw32)
+ chef (14.0.85-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.84)
+ chef-config (= 14.0.85)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.84)
+ chef-config (14.0.85)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 9df35766d7..3625a927f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.84 \ No newline at end of file
+14.0.85 \ 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 fa8034f2e6..4b5abbd4bb 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.0.84"
+ VERSION = "14.0.85"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 470661729a..2310a1d1f8 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.0.84")
+ VERSION = Chef::VersionString.new("14.0.85")
end
#