summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-31 17:53:18 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-31 17:53:18 +0000
commitd4a255a7525a4ac426d3ddd4655c6edf4053c781 (patch)
tree43b8ad5182f412b148412016c7a4767e9bf3300f
parent771ad63d3d7fc9d95f7cfc5a466f1b430e14182f (diff)
downloadchef-d4a255a7525a4ac426d3ddd4655c6edf4053c781.tar.gz
Bump version to 14.1.25 by Chef Expeditorv14.1.25
-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 5b54d5f4d7..20de381b1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.1.24 -->
-## [v14.1.24](https://github.com/chef/chef/tree/v14.1.24) (2018-05-31)
+<!-- latest_release 14.1.25 -->
+## [v14.1.25](https://github.com/chef/chef/tree/v14.1.25) (2018-05-31)
#### Merged Pull Requests
-- Properly print path to config file to the screen in knife configure [#7325](https://github.com/chef/chef/pull/7325) ([tas50](https://github.com/tas50))
+- windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay)) <!-- 14.1.25 -->
- Properly print path to config file to the screen in knife configure [#7325](https://github.com/chef/chef/pull/7325) ([tas50](https://github.com/tas50)) <!-- 14.1.24 -->
- add default_env flag to shell_out and execute resource [#7298](https://github.com/chef/chef/pull/7298) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.23 -->
- Cookbook Version: add host-&lt;fqdn&gt; to the error message for templates and files specificity [#7295](https://github.com/chef/chef/pull/7295) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 191f581fe6..8ba0dd67e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.24)
+ chef (14.1.25)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.24)
+ chef-config (= 14.1.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -46,10 +46,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.1.24-universal-mingw32)
+ chef (14.1.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.24)
+ chef-config (= 14.1.25)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.1.24)
+ chef-config (14.1.25)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -216,7 +216,7 @@ GEM
method_source (0.9.0)
mixlib-archive (0.4.6)
mixlib-log
- mixlib-authentication (2.0.0)
+ mixlib-authentication (2.1.0)
mixlib-cli (1.7.0)
mixlib-config (2.2.6)
tomlrb
diff --git a/VERSION b/VERSION
index a9dc0b9791..afbdc66f2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.24 \ No newline at end of file
+14.1.25 \ 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 4aa98a4c54..d5dbc00197 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.1.24"
+ VERSION = "14.1.25"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b97972e99a..6e4b42741d 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.1.24")
+ VERSION = Chef::VersionString.new("14.1.25")
end
#