summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-13 20:37:42 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-13 20:37:42 +0000
commit0a2f9d6b693b8d31e500f20b03710261b348917e (patch)
tree79b1e45b6c91aca5705b70ea065b70ad43928e8c
parentebe1d93571f6e81dcadee25dec36d8c189f47a94 (diff)
downloadchef-13.9.tar.gz
Bump version to 14.3.14 by Chef Expeditorv14.3.1413.9.113.9
-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 789e51dd42..871d7d2cee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.3.13 -->
-## [v14.3.13](https://github.com/chef/chef/tree/v14.3.13) (2018-06-13)
+<!-- latest_release 14.3.14 -->
+## [v14.3.14](https://github.com/chef/chef/tree/v14.3.14) (2018-06-13)
#### Merged Pull Requests
-- removing mwrock from client maintainers [#7369](https://github.com/chef/chef/pull/7369) ([mwrock](https://github.com/mwrock))
+- Pull in win32-taskscheduler 1.0.2 [#7371](https://github.com/chef/chef/pull/7371) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Pull in win32-taskscheduler 1.0.2 [#7371](https://github.com/chef/chef/pull/7371) ([tas50](https://github.com/tas50)) <!-- 14.3.14 -->
- removing mwrock from client maintainers [#7369](https://github.com/chef/chef/pull/7369) ([mwrock](https://github.com/mwrock)) <!-- 14.3.13 -->
- Add more property descriptions to resources [#7358](https://github.com/chef/chef/pull/7358) ([tas50](https://github.com/tas50)) <!-- 14.3.12 -->
- windows_feature_dism: Fix errors when specifying the source [#7370](https://github.com/chef/chef/pull/7370) ([tas50](https://github.com/tas50)) <!-- 14.3.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 67663af1bd..cd64529083 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.13)
+ chef (14.3.14)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.13)
+ chef-config (= 14.3.14)
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.3.13-universal-mingw32)
+ chef (14.3.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.13)
+ chef-config (= 14.3.14)
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.3.13)
+ chef-config (14.3.14)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 68abd838ea..b37f72e20b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.13 \ No newline at end of file
+14.3.14 \ 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 1137c66504..656864c9a0 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.3.13"
+ VERSION = "14.3.14"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1fe36033b4..723f114851 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.3.13")
+ VERSION = Chef::VersionString.new("14.3.14")
end
#