summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-26 18:12:40 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-26 18:12:40 +0000
commit5ab3b0903ab408ccd014228e9b69bae5c1d58cac (patch)
tree9a21402ad5c53f9027ce2a7aa1064b88920be7c6
parent36b62ad7d86d5ccf43b52d916f4a828058bf6047 (diff)
downloadchef-5ab3b0903ab408ccd014228e9b69bae5c1d58cac.tar.gz
Bump version to 14.0.83 by Expeditorv14.0.83
-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 1c083d503d..2d1e8bf74e 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.82 -->
-## [v14.0.82](https://github.com/chef/chef/tree/v14.0.82) (2018-02-26)
+<!-- latest_release 14.0.83 -->
+## [v14.0.83](https://github.com/chef/chef/tree/v14.0.83) (2018-02-26)
#### Merged Pull Requests
-- Convert parts of cron resource to use properties [#6904](https://github.com/chef/chef/pull/6904) ([tas50](https://github.com/tas50))
+- Add more introduced and description fields to resources [#6899](https://github.com/chef/chef/pull/6899) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- 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 -->
- revert lazy attributes [#6911](https://github.com/chef/chef/pull/6911) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.81 -->
- Simplify how we define the powershell_package resource_name [#6901](https://github.com/chef/chef/pull/6901) ([tas50](https://github.com/tas50)) <!-- 14.0.80 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 93eaf9c19d..ee53707c79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.82)
+ chef (14.0.83)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.82)
+ chef-config (= 14.0.83)
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.82-universal-mingw32)
+ chef (14.0.83-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.82)
+ chef-config (= 14.0.83)
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.82)
+ chef-config (14.0.83)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 8942c00157..e52ce33cd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.82 \ No newline at end of file
+14.0.83 \ 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 fc5abd7280..a9846fc696 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.82"
+ VERSION = "14.0.83"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b38f485bfa..87575c1d7f 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.82")
+ VERSION = Chef::VersionString.new("14.0.83")
end
#