summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ded1bff282..032c010804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.3.52 -->
-## [v13.3.52](https://github.com/chef/chef/tree/v13.3.52) (2017-08-25)
+<!-- latest_release 13.4.1 -->
+## [v13.4.1](https://github.com/chef/chef/tree/v13.4.1) (2017-08-28)
#### Merged Pull Requests
-- add codeowners for reviews [#6345](https://github.com/chef/chef/pull/6345) ([thommay](https://github.com/thommay))
+- Bumps Bundler version to 1.15.4 [#6349](https://github.com/chef/chef/pull/6349) ([jakauppila](https://github.com/jakauppila))
<!-- 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
+- Bumps Bundler version to 1.15.4 [#6349](https://github.com/chef/chef/pull/6349) ([jakauppila](https://github.com/jakauppila)) <!-- 13.4.1 -->
- add codeowners for reviews [#6345](https://github.com/chef/chef/pull/6345) ([thommay](https://github.com/thommay)) <!-- 13.3.52 -->
- Auto import gpg keys in zypper_repository [#6348](https://github.com/chef/chef/pull/6348) ([tas50](https://github.com/tas50)) <!-- 13.3.51 -->
- Add v12.21.4 to master&#39;s changelog [#6339](https://github.com/chef/chef/pull/6339) ([tas50](https://github.com/tas50)) <!-- 13.3.50 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c8b96d95ef..e3418b80bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.0)
+ chef (13.4.1)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.0)
+ chef-config (= 13.4.1)
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.0-universal-mingw32)
+ chef (13.4.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.0)
+ chef-config (= 13.4.1)
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.0)
+ chef-config (13.4.1)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -311,7 +311,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
slop (3.6.0)
- specinfra (2.70.1)
+ specinfra (2.71.0)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 74302c5119..2edbaa7e5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.0
+13.4.1 \ 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 7483524c0d..be356a9175 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.0"
+ VERSION = "13.4.1"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ea138018ee..085535bb13 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.0")
+ VERSION = Chef::VersionString.new("13.4.1")
end
#