summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-16 04:19:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-16 04:19:36 +0000
commit5a11bd4254d72841fc0f0bb3f367448c54e805cd (patch)
tree366b0b089c658f69e95ca977fe2735c62525b368
parent889c0dc9750d2754daaff379446abd28f8bb40e3 (diff)
downloadchef-14.1.12.tar.gz
Bump version to 14.1.12 by Chef Expeditorv14.1.12
-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 e4df43c5dc..9e2b5f25f6 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.11 -->
-## [v14.1.11](https://github.com/chef/chef/tree/v14.1.11) (2018-05-15)
+<!-- latest_release 14.1.12 -->
+## [v14.1.12](https://github.com/chef/chef/tree/v14.1.12) (2018-05-16)
#### Merged Pull Requests
-- Update win32-taskscheduler gem to fix creating tasks as the SYSTEM user [#7265](https://github.com/chef/chef/pull/7265) ([tas50](https://github.com/tas50))
+- Use some unique task names for windows_task functional tests [#7267](https://github.com/chef/chef/pull/7267) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.1.1 -->
### Changes since 14.1.1 release
#### Merged Pull Requests
+- Use some unique task names for windows_task functional tests [#7267](https://github.com/chef/chef/pull/7267) ([btm](https://github.com/btm)) <!-- 14.1.12 -->
- Update win32-taskscheduler gem to fix creating tasks as the SYSTEM user [#7265](https://github.com/chef/chef/pull/7265) ([tas50](https://github.com/tas50)) <!-- 14.1.11 -->
- Fix windows_task resource not handling commands with arguments [#7250](https://github.com/chef/chef/pull/7250) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.1.10 -->
- Update Ohai to 14.1.3 [#7258](https://github.com/chef/chef/pull/7258) ([tas50](https://github.com/tas50)) <!-- 14.1.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f482beb8bf..79b703084e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.11)
+ chef (14.1.12)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.11)
+ chef-config (= 14.1.12)
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.11-universal-mingw32)
+ chef (14.1.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.11)
+ chef-config (= 14.1.12)
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.11)
+ chef-config (14.1.12)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index eee5fa6051..2ca5601405 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.11 \ No newline at end of file
+14.1.12 \ 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 c6fa5f9945..ab69569572 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.11"
+ VERSION = "14.1.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c9e96a9240..326e4154a4 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.11")
+ VERSION = Chef::VersionString.new("14.1.12")
end
#