summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-17 18:18:39 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-17 18:18:39 +0000
commite32be48e2ddd4bef2bad482687264f7cd8567b68 (patch)
tree7252d946933351431bab8fac807dba9f6eaf91c8
parente2154e25a5e411d79c27f194d89e0b8185d005d6 (diff)
downloadchef-e32be48e2ddd4bef2bad482687264f7cd8567b68.tar.gz
Bump version to 13.7.11 by Expeditorv13.7.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 436f9dc2be..842fe76473 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.10 -->
-## [v13.7.10](https://github.com/chef/chef/tree/v13.7.10) (2018-01-15)
+<!-- latest_release 13.7.11 -->
+## [v13.7.11](https://github.com/chef/chef/tree/v13.7.11) (2018-01-17)
#### 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))
+- simplify node_map logic [#6637](https://github.com/chef/chef/pull/6637) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- simplify node_map logic [#6637](https://github.com/chef/chef/pull/6637) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.11 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 62af74ec7b..b03fdb787b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.10)
+ chef (13.7.11)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.10)
+ chef-config (= 13.7.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.7.10-universal-mingw32)
+ chef (13.7.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.10)
+ chef-config (= 13.7.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.7.10)
+ chef-config (13.7.11)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 9642ec5b10..1f45525ed5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.10 \ No newline at end of file
+13.7.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 8f14a5e6ca..4bc78be86b 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.10"
+ VERSION = "13.7.11"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f4763a60d6..049b3143e1 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.10")
+ VERSION = Chef::VersionString.new("13.7.11")
end
#