summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-12 16:27:30 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-12 16:27:30 +0000
commitaf41f4fd301612a672d864ad6a7ef98ae8db493f (patch)
tree07f4df3e73be69265b7083c704903327cf0fc6dd
parent870f1aeb7574f02116fb2e46014cf82c090070d4 (diff)
downloadchef-af41f4fd301612a672d864ad6a7ef98ae8db493f.tar.gz
Bump version to 14.0.196 by Expeditorv14.0.196
-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 0e7196b027..5c5e38ee0d 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.195 -->
-## [v14.0.195](https://github.com/chef/chef/tree/v14.0.195) (2018-04-11)
+<!-- latest_release 14.0.196 -->
+## [v14.0.196](https://github.com/chef/chef/tree/v14.0.196) (2018-04-12)
#### Merged Pull Requests
-- fix Chef-14 chef_fs/chef-zero perf regression [#7143](https://github.com/chef/chef/pull/7143) ([lamont-granquist](https://github.com/lamont-granquist))
+- fix for enable/disable repo ordering [#7148](https://github.com/chef/chef/pull/7148) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.0.190 -->
### Changes since 14.0.190 release
#### Merged Pull Requests
+- fix for enable/disable repo ordering [#7148](https://github.com/chef/chef/pull/7148) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.196 -->
- fix Chef-14 chef_fs/chef-zero perf regression [#7143](https://github.com/chef/chef/pull/7143) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.195 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e6daa79056..7ad3ba1547 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.195)
+ chef (14.0.196)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.195)
+ chef-config (= 14.0.196)
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.195-universal-mingw32)
+ chef (14.0.196-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.195)
+ chef-config (= 14.0.196)
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.195)
+ chef-config (14.0.196)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -218,7 +218,7 @@ GEM
mixlib-cli (1.7.0)
mixlib-config (2.2.6)
tomlrb
- mixlib-log (2.0.3)
+ mixlib-log (2.0.4)
mixlib-shellout (2.3.2)
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
diff --git a/VERSION b/VERSION
index 09217d1358..e562f070ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.195 \ No newline at end of file
+14.0.196 \ 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 eef17faa64..1338919aac 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.195"
+ VERSION = "14.0.196"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2073edeb3e..84726733d5 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.195")
+ VERSION = Chef::VersionString.new("14.0.196")
end
#