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 9867341177..27561877c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.4.7 -->
-## [v13.4.7](https://github.com/chef/chef/tree/v13.4.7) (2017-08-29)
+<!-- latest_release 13.4.8 -->
+## [v13.4.8](https://github.com/chef/chef/tree/v13.4.8) (2017-08-31)
#### Merged Pull Requests
-- bump rubygems to 2.6.13 [#6365](https://github.com/chef/chef/pull/6365) ([lamont-granquist](https://github.com/lamont-granquist))
+- Ensure that our maintainers are all synced [#6368](https://github.com/chef/chef/pull/6368) ([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
+- Ensure that our maintainers are all synced [#6368](https://github.com/chef/chef/pull/6368) ([thommay](https://github.com/thommay)) <!-- 13.4.8 -->
- bump rubygems to 2.6.13 [#6365](https://github.com/chef/chef/pull/6365) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.4.7 -->
- Link to the knife docs in both places where we error on editor [#6363](https://github.com/chef/chef/pull/6363) ([tas50](https://github.com/tas50)) <!-- 13.4.6 -->
- node attributes: remove useless dup in merge_all [#6356](https://github.com/chef/chef/pull/6356) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.4.5 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 645d8371ce..285dc2e6ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.7)
+ chef (13.4.8)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.7)
+ chef-config (= 13.4.8)
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.7-universal-mingw32)
+ chef (13.4.8-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.7)
+ chef-config (= 13.4.8)
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.7)
+ chef-config (13.4.8)
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.71.0)
+ specinfra (2.71.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index b64e52773f..31ff3f726d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.7 \ No newline at end of file
+13.4.8 \ 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 c7892d4965..90a01dd0ba 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.7"
+ VERSION = "13.4.8"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0cfc9f8ee4..c7ea6681c4 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.7")
+ VERSION = Chef::VersionString.new("13.4.8")
end
#