summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-09 17:51:19 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-09 17:51:19 +0000
commit76fa86f06fc4b4ed2c4ba165c64b28538c6d637c (patch)
tree9d60a78e958bf2c8409b8daacd0f6d9d820aff9f
parent574a3611bb508a207d06aba1bb9040a4e14837ed (diff)
downloadchef-76fa86f06fc4b4ed2c4ba165c64b28538c6d637c.tar.gz
Bump version to 14.0.194 by Expeditorv14.0.194
-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 849399ba8c..f28cccbcf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.193 -->
-## [v14.0.193](https://github.com/chef/chef/tree/v14.0.193) (2018-04-07)
+<!-- latest_release 14.0.194 -->
+## [v14.0.194](https://github.com/chef/chef/tree/v14.0.194) (2018-04-09)
#### Merged Pull Requests
-- Modify the provides for all resources from cookbooks so chef wins [#7134](https://github.com/chef/chef/pull/7134) ([tas50](https://github.com/tas50))
+- Fix RHSM registration using passwords [#7133](https://github.com/chef/chef/pull/7133) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.0.190 -->
### Changes since 14.0.190 release
#### Merged Pull Requests
+- Fix RHSM registration using passwords [#7133](https://github.com/chef/chef/pull/7133) ([tas50](https://github.com/tas50)) <!-- 14.0.194 -->
- Modify the provides for all resources from cookbooks so chef wins [#7134](https://github.com/chef/chef/pull/7134) ([tas50](https://github.com/tas50)) <!-- 14.0.193 -->
- add delegator for property_is_set? to providers [#7122](https://github.com/chef/chef/pull/7122) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.192 -->
- Update InSpec to 2.1.21 [#7109](https://github.com/chef/chef/pull/7109) ([tas50](https://github.com/tas50)) <!-- 14.0.191 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 64c8ca43da..20a808c489 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.193)
+ chef (14.0.194)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.193)
+ chef-config (= 14.0.194)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,10 +45,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.193-universal-mingw32)
+ chef (14.0.194-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.193)
+ chef-config (= 14.0.194)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -90,7 +90,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.193)
+ chef-config (14.0.194)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 1b8f7d12c7..59f7c5d810 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.193 \ No newline at end of file
+14.0.194 \ 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 bd5dd60574..69738585c1 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 = "14.0.193"
+ VERSION = "14.0.194"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1e3485bfb0..c0c9c30f71 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("14.0.193")
+ VERSION = Chef::VersionString.new("14.0.194")
end
#