summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 23:16:09 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 23:16:09 +0000
commit4f3a03cf7d8134bca77504316c2e08fc3bdbfcea (patch)
treed65027ec9d665334b87ea40483a8289c89fabd81
parentf6c43d60a2360106f5ab3af1ff228b18c89de122 (diff)
downloadchef-4f3a03cf7d8134bca77504316c2e08fc3bdbfcea.tar.gz
Bump version to 14.5.17 by Chef Expeditorv14.5.17
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0117af487b..d82d7b560e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.5.16 -->
-## [v14.5.16](https://github.com/chef/chef/tree/v14.5.16) (2018-09-14)
+<!-- latest_release 14.5.17 -->
+## [v14.5.17](https://github.com/chef/chef/tree/v14.5.17) (2018-09-14)
#### Merged Pull Requests
-- Update libarchive to 3.3.3 [#7641](https://github.com/chef/chef/pull/7641) ([tas50](https://github.com/tas50))
+- Rename windows_ad_join&#39;s newname to be new_hostname [#7643](https://github.com/chef/chef/pull/7643) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- Rename windows_ad_join&#39;s newname to be new_hostname [#7643](https://github.com/chef/chef/pull/7643) ([tas50](https://github.com/tas50)) <!-- 14.5.17 -->
- Update libarchive to 3.3.3 [#7641](https://github.com/chef/chef/pull/7641) ([tas50](https://github.com/tas50)) <!-- 14.5.16 -->
- windows_workgroup Resource for joining Windows Workgroups [#7564](https://github.com/chef/chef/pull/7564) ([derekgroh](https://github.com/derekgroh)) <!-- 14.5.15 -->
- Bump inspec-core to 2.2.101 [#7640](https://github.com/chef/chef/pull/7640) ([chef-ci](https://github.com/chef-ci)) <!-- 14.5.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2080058f5c..4e5a17b022 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.16)
+ chef (14.5.17)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.16)
+ chef-config (= 14.5.17)
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.5.16-universal-mingw32)
+ chef (14.5.17-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.16)
+ chef-config (= 14.5.17)
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.5.16)
+ chef-config (14.5.17)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -205,7 +205,7 @@ GEM
netrc (0.11.0)
octokit (4.12.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.4.2)
+ ohai (14.5.0)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
diff --git a/VERSION b/VERSION
index d3d9a5dbb7..daf83ac239 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.16 \ No newline at end of file
+14.5.17 \ 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 5ad5f164cd..336cf42a6c 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.5.16".freeze
+ VERSION = "14.5.17".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f5c95ae273..882a3dbaa4 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.5.16")
+ VERSION = Chef::VersionString.new("14.5.17")
end
#