summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-01 16:58:43 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-01 16:58:43 +0000
commit88b3dc1f889a82111b879061273f3e684100beaf (patch)
tree0fcb924a0361cc85653e28a73d918c4bcb33d608
parent36e9b606d54a6c70a552592f25143b8a4266a56b (diff)
downloadchef-88b3dc1f889a82111b879061273f3e684100beaf.tar.gz
Bump version to 13.4.11 by Chef Expeditorv13.4.11
-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 091c37131f..7fc287f641 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.4.10 -->
-## [v13.4.10](https://github.com/chef/chef/tree/v13.4.10) (2017-09-01)
+<!-- latest_release 13.4.11 -->
+## [v13.4.11](https://github.com/chef/chef/tree/v13.4.11) (2017-09-01)
#### Merged Pull Requests
-- Support an array of keys for apt_repository [#6372](https://github.com/chef/chef/pull/6372) ([gsreynolds](https://github.com/gsreynolds))
+- immutablize properly as we deep merge [#6362](https://github.com/chef/chef/pull/6362) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- 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
+- immutablize properly as we deep merge [#6362](https://github.com/chef/chef/pull/6362) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.4.11 -->
- Support an array of keys for apt_repository [#6372](https://github.com/chef/chef/pull/6372) ([gsreynolds](https://github.com/gsreynolds)) <!-- 13.4.10 -->
- Ship chef-vault in the omnibus package [#6370](https://github.com/chef/chef/pull/6370) ([thommay](https://github.com/thommay)) <!-- 13.4.9 -->
- Ensure that our maintainers are all synced [#6368](https://github.com/chef/chef/pull/6368) ([thommay](https://github.com/thommay)) <!-- 13.4.8 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f3d1845717..cbeba7a841 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.10)
+ chef (13.4.11)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.10)
+ chef-config (= 13.4.11)
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.10-universal-mingw32)
+ chef (13.4.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.10)
+ chef-config (= 13.4.11)
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.10)
+ chef-config (13.4.11)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 2ea578e9e9..6f64f636bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.10 \ No newline at end of file
+13.4.11 \ 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 061c6fc962..814d1e5e97 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.10"
+ VERSION = "13.4.11"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2921af41da..a2852a4b8f 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.10")
+ VERSION = Chef::VersionString.new("13.4.11")
end
#