summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-21 17:03:15 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-21 17:03:15 +0000
commit49c4609d71974950f45c72d9fb801ce249d4108d (patch)
tree8c354bffa0f9bc95b2ce250627a7729903f2d549
parent35e9edbecaff6f10dca4eef463d8d1e0c00338e5 (diff)
downloadchef-49c4609d71974950f45c72d9fb801ce249d4108d.tar.gz
Bump version to 15.0.134 by Chef Expeditorv15.0.134
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 c0d041f78d..25e8a1102c 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.133 -->
-## [v15.0.133](https://github.com/chef/chef/tree/v15.0.133) (2019-01-21)
+<!-- latest_release 15.0.134 -->
+## [v15.0.134](https://github.com/chef/chef/tree/v15.0.134) (2019-01-21)
#### Merged Pull Requests
-- Allow for mixlib-archive 1.x [#8137](https://github.com/chef/chef/pull/8137) ([tas50](https://github.com/tas50))
+- Sysctl: Allow slashes in key or block name [#8136](https://github.com/chef/chef/pull/8136) ([kapilchouhan99](https://github.com/kapilchouhan99))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- 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 -->
- Fix cask resource running each chef-client run [#8140](https://github.com/chef/chef/pull/8140) ([jeroenj](https://github.com/jeroenj)) <!-- 15.0.132 -->
- Updates homebrew_cask tap name [#8139](https://github.com/chef/chef/pull/8139) ([jeroenj](https://github.com/jeroenj)) <!-- 15.0.131 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a40795fe97..4de6ca8334 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.133)
+ chef (15.0.134)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.133)
+ chef-config (= 15.0.134)
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.133-universal-mingw32)
+ chef (15.0.134-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.133)
+ chef-config (= 15.0.134)
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.133)
+ chef-config (15.0.134)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 60604268ef..23d10e6849 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.133 \ No newline at end of file
+15.0.134 \ 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 317dd9541a..65c0166a30 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.133".freeze
+ VERSION = "15.0.134".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 049415b055..914f411d85 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.133")
+ VERSION = Chef::VersionString.new("15.0.134")
end
#