summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-22 22:00:50 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-22 22:00:50 +0000
commit41e43dbf36b1f1e7cf82b924e066b9d430dc41eb (patch)
tree671bdd189e8d419527b534f35d07a404aab231c2
parent1ddf84c58fe5bab7e7613d79758d5ee3fcf4824d (diff)
downloadchef-41e43dbf36b1f1e7cf82b924e066b9d430dc41eb.tar.gz
Bump version to 15.0.136 by Chef Expeditorv15.0.136
Obvious fix; these changes are the result of automation not creative thinking.
-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 82a11341e8..d183624684 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.135 -->
-## [v15.0.135](https://github.com/chef/chef/tree/v15.0.135) (2019-01-22)
+<!-- latest_release 15.0.136 -->
+## [v15.0.136](https://github.com/chef/chef/tree/v15.0.136) (2019-01-22)
#### Merged Pull Requests
-- Hide knife cookbook site &amp; null by setting them to deprecated category [#8148](https://github.com/chef/chef/pull/8148) ([tas50](https://github.com/tas50))
+- Add a deprecation warning to knife cookbook site [#8149](https://github.com/chef/chef/pull/8149) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Add a deprecation warning to knife cookbook site [#8149](https://github.com/chef/chef/pull/8149) ([tas50](https://github.com/tas50)) <!-- 15.0.136 -->
- Hide knife cookbook site &amp; null by setting them to deprecated category [#8148](https://github.com/chef/chef/pull/8148) ([tas50](https://github.com/tas50)) <!-- 15.0.135 -->
- Sysctl: Allow slashes in key or block name [#8136](https://github.com/chef/chef/pull/8136) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.0.134 -->
- Allow for mixlib-archive 1.x [#8137](https://github.com/chef/chef/pull/8137) ([tas50](https://github.com/tas50)) <!-- 15.0.133 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d4ff6d277e..b9d394a3cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.135)
+ chef (15.0.136)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.135)
+ chef-config (= 15.0.136)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.135-universal-mingw32)
+ chef (15.0.136-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.135)
+ chef-config (= 15.0.136)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.135)
+ chef-config (15.0.136)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 18009d3469..bd64fe42e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.135 \ No newline at end of file
+15.0.136 \ 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 7e2ddb84b2..dc67e379bc 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 = "15.0.135".freeze
+ VERSION = "15.0.136".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0fabdee2c6..c0d09903b6 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("15.0.135")
+ VERSION = Chef::VersionString.new("15.0.136")
end
#