summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-03 10:04:42 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-03 10:04:42 +0000
commit5efb3f2ada9718b8c1f72cd6c4703b972491f6cd (patch)
tree5f238d5bd960e16e2e1472862e4b12a382d69043
parent1ae46b7fe459d9716c8518095bb27912d6de5d33 (diff)
downloadchef-5efb3f2ada9718b8c1f72cd6c4703b972491f6cd.tar.gz
Bump version to 13.7.3 by Expeditorv13.7.3
-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 6883d962b3..4df8b5f34d 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.2 -->
-## [v13.7.2](https://github.com/chef/chef/tree/v13.7.2) (2018-01-02)
+<!-- latest_release 13.7.3 -->
+## [v13.7.3](https://github.com/chef/chef/tree/v13.7.3) (2018-01-03)
#### Merged Pull Requests
-- Update the knife editor error message to point to the correct document [#6726](https://github.com/chef/chef/pull/6726) ([tas50](https://github.com/tas50))
+- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50)) <!-- 13.7.3 -->
- Update the knife editor error message to point to the correct document [#6726](https://github.com/chef/chef/pull/6726) ([tas50](https://github.com/tas50)) <!-- 13.7.2 -->
- Remove a useless regex in zypper_repository resource [#6710](https://github.com/chef/chef/pull/6710) ([tas50](https://github.com/tas50)) <!-- 13.7.1 -->
- Deprecate erl_call resource [#6720](https://github.com/chef/chef/pull/6720) ([tas50](https://github.com/tas50)) <!-- 13.6.57 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c568a8d1e..2a6e1d2f46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.2)
+ chef (13.7.3)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.2)
+ chef-config (= 13.7.3)
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.2-universal-mingw32)
+ chef (13.7.3-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.2)
+ chef-config (= 13.7.3)
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.2)
+ chef-config (13.7.3)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -265,7 +265,7 @@ GEM
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
- rspec-core (3.7.0)
+ rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
diff --git a/VERSION b/VERSION
index 4ed0bdb871..e32d1dd484 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.2 \ No newline at end of file
+13.7.3 \ 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 cfa002048b..7f1c2e39ea 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.2"
+ VERSION = "13.7.3"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 209c877155..759b647376 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.2")
+ VERSION = Chef::VersionString.new("13.7.3")
end
#