summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-06 19:57:44 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-06 19:57:44 +0000
commit45abfaad3eb4e386abdd5e1d7969c480720063da (patch)
tree456d31bf2fe9cf51aceeb6684c97a897f8807d49
parenteb7c9a6c972fad90c791a442ff76740d76dab8cd (diff)
downloadchef-13.4.15.tar.gz
Bump version to 13.4.15 by Chef Expeditorv13.4.15
-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 2028b3c12f..38b1344dbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.4.14 -->
-## [v13.4.14](https://github.com/chef/chef/tree/v13.4.14) (2017-09-06)
+<!-- latest_release 13.4.15 -->
+## [v13.4.15](https://github.com/chef/chef/tree/v13.4.15) (2017-09-06)
#### Merged Pull Requests
-- Launchd should not load launchagents as root. [#6353](https://github.com/chef/chef/pull/6353) ([mikedodge04](https://github.com/mikedodge04))
+- update release notes for 13.4 [#6381](https://github.com/chef/chef/pull/6381) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -12,6 +12,7 @@
- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 -->
#### Merged Pull Requests
+- update release notes for 13.4 [#6381](https://github.com/chef/chef/pull/6381) ([thommay](https://github.com/thommay)) <!-- 13.4.15 -->
- Launchd should not load launchagents as root. [#6353](https://github.com/chef/chef/pull/6353) ([mikedodge04](https://github.com/mikedodge04)) <!-- 13.4.14 -->
- Alternate user local logon authentication for remote_file resource [#5832](https://github.com/chef/chef/pull/5832) ([NimishaS](https://github.com/NimishaS)) <!-- 13.4.13 -->
- handle apple git [#6359](https://github.com/chef/chef/pull/6359) ([kzw](https://github.com/kzw)) <!-- 13.4.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 780910e7e2..1d4b5e0ea2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.14)
+ chef (13.4.15)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.14)
+ chef-config (= 13.4.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.4.14-universal-mingw32)
+ chef (13.4.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.14)
+ chef-config (= 13.4.15)
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 (13.4.14)
+ chef-config (13.4.15)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 27362e4d5d..5fe4debfe4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.14 \ No newline at end of file
+13.4.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 00b26b1032..54b37ff892 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 = "13.4.14"
+ VERSION = "13.4.15"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ecfd14dff0..6ccb1be93d 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("13.4.14")
+ VERSION = Chef::VersionString.new("13.4.15")
end
#