summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 18:28:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 18:28:36 +0000
commit2bfc4383c3cc875f3e5b5d8595bd0969285dc61c (patch)
tree0aa3cbce9f27c607ae970743584f64c836ae0427
parentbacdb274870acea0eb689669bd5c903ccfeae20d (diff)
downloadchef-14.5.15.tar.gz
Bump version to 14.5.15 by Chef Expeditorv14.5.15
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 86d5044bf3..4500f48182 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.14 -->
-## [v14.5.14](https://github.com/chef/chef/tree/v14.5.14) (2018-09-14)
+<!-- latest_release 14.5.15 -->
+## [v14.5.15](https://github.com/chef/chef/tree/v14.5.15) (2018-09-14)
#### Merged Pull Requests
-- Bump inspec-core to 2.2.101 [#7640](https://github.com/chef/chef/pull/7640) ([chef-ci](https://github.com/chef-ci))
+- windows_workgroup Resource for joining Windows Workgroups [#7564](https://github.com/chef/chef/pull/7564) ([derekgroh](https://github.com/derekgroh))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- 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 -->
- windows_ad_join resource - add newname property [#7637](https://github.com/chef/chef/pull/7637) ([derekgroh](https://github.com/derekgroh)) <!-- 14.5.13 -->
- Add locale resource more managing the system&#39;s locale [#7633](https://github.com/chef/chef/pull/7633) ([vincentaubert](https://github.com/vincentaubert)) <!-- 14.5.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 498c56f092..dd28ff7ad4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.14)
+ chef (14.5.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.14)
+ chef-config (= 14.5.15)
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.14-universal-mingw32)
+ chef (14.5.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.14)
+ chef-config (= 14.5.15)
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.14)
+ chef-config (14.5.15)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index ebfabcd0c9..7251a0f372 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.14 \ No newline at end of file
+14.5.15 \ 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 e1ad17e024..a54ea88ea4 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.14".freeze
+ VERSION = "14.5.15".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ab3d5acddc..4ec0eb267e 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.14")
+ VERSION = Chef::VersionString.new("14.5.15")
end
#