summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-18 09:14:31 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-18 09:14:31 +0000
commit25d1ec70d26e999a9998e6b8df6078f0df01aa5a (patch)
tree3549ffbaed46513c4eb46602478b1f8b80c092bd
parentb09075ee9a7a8eaa5993ad555d6acd2f803ea092 (diff)
downloadchef-25d1ec70d26e999a9998e6b8df6078f0df01aa5a.tar.gz
Bump version to 13.6.8 by Expeditorv13.6.8
-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 66ca41ce14..fed36d9d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.7 -->
-## [v13.6.7](https://github.com/chef/chef/tree/v13.6.7) (2017-11-15)
+<!-- latest_release 13.6.8 -->
+## [v13.6.8](https://github.com/chef/chef/tree/v13.6.8) (2017-11-18)
#### Merged Pull Requests
-- Change a useradd_spec test for RHEL &gt;= 6.8 and &gt;= 7.3 [#6555](https://github.com/chef/chef/pull/6555) ([jeremiahsnapp](https://github.com/jeremiahsnapp))
+- Fix mount test, also update ifconfig to work with both common versions. [#6587](https://github.com/chef/chef/pull/6587) ([scotthain](https://github.com/scotthain))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Fix mount test, also update ifconfig to work with both common versions. [#6587](https://github.com/chef/chef/pull/6587) ([scotthain](https://github.com/scotthain)) <!-- 13.6.8 -->
- Change a useradd_spec test for RHEL &gt;= 6.8 and &gt;= 7.3 [#6555](https://github.com/chef/chef/pull/6555) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) <!-- 13.6.7 -->
- replace deprecated Dir.exists? with Dir.exist? [#6583](https://github.com/chef/chef/pull/6583) ([thomasdziedzic](https://github.com/thomasdziedzic)) <!-- 13.6.6 -->
- Add ohai_time to minimal_ohai filter [#6584](https://github.com/chef/chef/pull/6584) ([btm](https://github.com/btm)) <!-- 13.6.5 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f22780e2c..aca2f26049 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.7)
+ chef (13.6.8)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.7)
+ chef-config (= 13.6.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.6.7-universal-mingw32)
+ chef (13.6.8-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.7)
+ chef-config (= 13.6.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.6.7)
+ chef-config (13.6.8)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 51067b9c1d..34156b2636 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.7 \ No newline at end of file
+13.6.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 71a7611ca1..9a128f96a0 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.6.7"
+ VERSION = "13.6.8"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 33f8b0cf00..8f61c691c7 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.6.7")
+ VERSION = Chef::VersionString.new("13.6.8")
end
#