summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-24 21:09:30 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-24 21:09:30 +0000
commitf8f3b2499f45d7392b6500f781f8a70c26d3b113 (patch)
tree00afb27381e0254d191255bf21e96ab9506ab1b4
parent2003c28b28a481b429eba4fe0fccdabbc6ec21c6 (diff)
downloadchef-f8f3b2499f45d7392b6500f781f8a70c26d3b113.tar.gz
Bump version to 15.0.315 by Chef Expeditorv15.0.315
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e935a6d754..e7edbf615c 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.314 -->
-## [v15.0.314](https://github.com/chef/chef/tree/v15.0.314) (2019-05-24)
+<!-- latest_release 15.0.315 -->
+## [v15.0.315](https://github.com/chef/chef/tree/v15.0.315) (2019-05-24)
#### Merged Pull Requests
-- Add introduced field to launch_events in launchd [#8592](https://github.com/chef/chef/pull/8592) ([tas50](https://github.com/tas50))
+- Chef-15: Add missing deprecated options [#8573](https://github.com/chef/chef/pull/8573) ([vsingh-msys](https://github.com/vsingh-msys))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Chef-15: Add missing deprecated options [#8573](https://github.com/chef/chef/pull/8573) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.315 -->
- Add introduced field to launch_events in launchd [#8592](https://github.com/chef/chef/pull/8592) ([tas50](https://github.com/tas50)) <!-- 15.0.314 -->
- Chef 15: Fix order of connection before registering node [#8574](https://github.com/chef/chef/pull/8574) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 15.0.313 -->
- launchd: add launch_events property [#8582](https://github.com/chef/chef/pull/8582) ([chilcote](https://github.com/chilcote)) <!-- 15.0.312 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b06b10ea02..8b30e473ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.314)
+ chef (15.0.315)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.314)
+ chef-config (= 15.0.315)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.314-universal-mingw32)
+ chef (15.0.315-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.314)
+ chef-config (= 15.0.315)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.0.314)
- chef (= 15.0.314)
+ chef-bin (15.0.315)
+ chef (= 15.0.315)
PATH
remote: chef-config
specs:
- chef-config (15.0.314)
+ chef-config (15.0.315)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index b8cb0e6804..319e1f6b57 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.314 \ No newline at end of file
+15.0.315 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 9951f34172..e683a5eb1c 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.0.314".freeze
+ VERSION = "15.0.315".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index e40160b563..840121b79d 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.314".freeze
+ VERSION = "15.0.315".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index efe048cf24..f963bfb909 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.0.314")
+ VERSION = Chef::VersionString.new("15.0.315")
end
#