summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-15 17:20:15 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-15 17:20:15 +0000
commitfcd8d778baeeb990a64fe9042164bbd3e1dd5269 (patch)
tree842341891b355dbcd5f62892305597bddd18be53
parentf306c0edf623f84bb7f5acc9a107a844869da7f3 (diff)
downloadchef-fcd8d778baeeb990a64fe9042164bbd3e1dd5269.tar.gz
Bump version to 13.7.10 by Expeditorv13.7.10
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock16
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9e81c571b..436f9dc2be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.7.9 -->
-## [v13.7.9](https://github.com/chef/chef/tree/v13.7.9) (2018-01-08)
+<!-- latest_release 13.7.10 -->
+## [v13.7.10](https://github.com/chef/chef/tree/v13.7.10) (2018-01-15)
#### Merged Pull Requests
-- Enable the deprecation for use_inline_resource [#6732](https://github.com/chef/chef/pull/6732) ([tas50](https://github.com/tas50))
+- Fix knife status to show seconds when needed #5055 [#6738](https://github.com/chef/chef/pull/6738) ([cramaechi](https://github.com/cramaechi))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Fix knife status to show seconds when needed #5055 [#6738](https://github.com/chef/chef/pull/6738) ([cramaechi](https://github.com/cramaechi)) <!-- 13.7.10 -->
- Enable the deprecation for use_inline_resource [#6732](https://github.com/chef/chef/pull/6732) ([tas50](https://github.com/tas50)) <!-- 13.7.9 -->
- Fix dscl group provider gid_used? [#6703](https://github.com/chef/chef/pull/6703) ([get9](https://github.com/get9)) <!-- 13.7.8 -->
- Fix windows_task resource not being idempotent for random_delay and execution_time_limit [#6688](https://github.com/chef/chef/pull/6688) ([Vasu1105](https://github.com/Vasu1105)) <!-- 13.7.7 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0bec44d334..62af74ec7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.9)
+ chef (13.7.10)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.9)
+ chef-config (= 13.7.10)
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.7.9-universal-mingw32)
+ chef (13.7.10-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.9)
+ chef-config (= 13.7.10)
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.7.9)
+ chef-config (13.7.10)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -203,7 +203,7 @@ GEM
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
- multi_json (1.12.2)
+ multi_json (1.13.1)
multipart-post (2.0.0)
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
@@ -222,7 +222,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.7.0)
+ ohai (13.7.1)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -309,7 +309,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.73.0)
+ specinfra (2.73.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 470e34e1d7..9642ec5b10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.9 \ No newline at end of file
+13.7.10 \ 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 dad3aca1cb..8f14a5e6ca 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.7.9"
+ VERSION = "13.7.10"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 252befb268..f4763a60d6 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.7.9")
+ VERSION = Chef::VersionString.new("13.7.10")
end
#