summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-04 21:00:22 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-04 21:00:22 +0000
commit0ab5435907d7f6c380b9e3ea49014a3b8a9863dc (patch)
treedcd82d56719e06e9745f36db76bf2511420c61f2
parentffdeb56f86eae061df56836d70e0f16f2db1c3bc (diff)
downloadchef-0ab5435907d7f6c380b9e3ea49014a3b8a9863dc.tar.gz
Bump version to 15.0.36 by Chef Expeditorv15.0.36
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 4d925922a8..ed8cf99c8a 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.35 -->
-## [v15.0.35](https://github.com/chef/chef/tree/v15.0.35) (2018-11-02)
+<!-- latest_release 15.0.36 -->
+## [v15.0.36](https://github.com/chef/chef/tree/v15.0.36) (2018-11-04)
#### Merged Pull Requests
-- Add additional github issue templates [#7859](https://github.com/chef/chef/pull/7859) ([tas50](https://github.com/tas50))
+- Remove knife user support for open source Chef Server &lt; 12 [#7841](https://github.com/chef/chef/pull/7841) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Remove knife user support for open source Chef Server &lt; 12 [#7841](https://github.com/chef/chef/pull/7841) ([tas50](https://github.com/tas50)) <!-- 15.0.36 -->
- Add additional github issue templates [#7859](https://github.com/chef/chef/pull/7859) ([tas50](https://github.com/tas50)) <!-- 15.0.35 -->
- Chef 15 node attribute array fixes [#7840](https://github.com/chef/chef/pull/7840) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.34 -->
- Remove the check for nil code property in the script provider [#7855](https://github.com/chef/chef/pull/7855) ([tas50](https://github.com/tas50)) <!-- 15.0.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cd9cb1589d..483fcc7abc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.35)
+ chef (15.0.36)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.35)
+ chef-config (= 15.0.36)
chef-zero (>= 13.0)
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.35-universal-mingw32)
+ chef (15.0.36-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.35)
+ chef-config (= 15.0.36)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.35)
+ chef-config (15.0.36)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index b43721930f..c2c217c949 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.35 \ No newline at end of file
+15.0.36 \ 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 8f63306517..5699837b35 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.35".freeze
+ VERSION = "15.0.36".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6baa463cae..6f50fe5021 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.35")
+ VERSION = Chef::VersionString.new("15.0.36")
end
#