summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-26 20:03:16 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-26 20:03:16 +0000
commit1b6c746837441123376dcb0737f8e8cb91c292aa (patch)
tree677066986477781416c11d4fa458dd998e1ce7fe
parent8f158e9e11bbedd53697c3b98de7b1bb540e6c35 (diff)
downloadchef-1b6c746837441123376dcb0737f8e8cb91c292aa.tar.gz
Bump version to 15.0.1 by Chef Expeditorv15.0.1
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md6
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3460f3bde4..1fc470e11d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 15.0.1 -->
+## [v15.0.1](https://github.com/chef/chef/tree/v15.0.1) (2018-10-26)
#### Merged Pull Requests
+- Remove the deprecated knife bootstrap --identity-file flag [#7489](https://github.com/chef/chef/pull/7489) ([tas50](https://github.com/tas50))
- Start Chef 15 development [#7785](https://github.com/chef/chef/pull/7785) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes since latest stable release
#### Merged Pull Requests
+- Remove the deprecated knife bootstrap --identity-file flag [#7489](https://github.com/chef/chef/pull/7489) ([tas50](https://github.com/tas50)) <!-- 15.0.1 -->
- Start Chef 15 development [#7785](https://github.com/chef/chef/pull/7785) ([tas50](https://github.com/tas50)) <!-- 15.0.0 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bf5282b67..c5a3ee049d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 2dd9de9143afac54de475d730572897ab4730a06
+ revision: f5c813bb7f865cdef670c8b14fc150912f48be0e
branch: master
specs:
- ohai (15.0.0)
+ ohai (15.0.1)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.0)
+ chef (15.0.1)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.0)
+ chef-config (= 15.0.1)
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.0-universal-mingw32)
+ chef (15.0.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.0)
+ chef-config (= 15.0.1)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -103,7 +103,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.0)
+ chef-config (15.0.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 94188a7483..9dc738e691 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.0
+15.0.1 \ 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 53df0caa9a..d9f70e1b61 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.0".freeze
+ VERSION = "15.0.1".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7da7840685..9823872328 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.0")
+ VERSION = Chef::VersionString.new("15.0.1")
end
#