summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-06 15:50:29 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-06 15:50:29 +0000
commit3f8efb05853364bcff846e9f98bb6fbf6773fe58 (patch)
treef6e7ba2c5aa1a95371a085bcbedfd39dabf9fa83
parent975fc46143290dc3075307f278fbfce972d81d30 (diff)
downloadchef-3f8efb05853364bcff846e9f98bb6fbf6773fe58.tar.gz
Bump version to 15.0.261 by Chef Expeditorv15.0.261
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 7b2f9a2589..2b70c64c34 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.260 -->
-## [v15.0.260](https://github.com/chef/chef/tree/v15.0.260) (2019-05-06)
+<!-- latest_release 15.0.261 -->
+## [v15.0.261](https://github.com/chef/chef/tree/v15.0.261) (2019-05-06)
#### Merged Pull Requests
-- Resolve exceptions when running knife diff [#8459](https://github.com/chef/chef/pull/8459) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix for cron resource get confused by environment/property mismatch [#8455](https://github.com/chef/chef/pull/8455) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Fix for cron resource get confused by environment/property mismatch [#8455](https://github.com/chef/chef/pull/8455) ([btm](https://github.com/btm)) <!-- 15.0.261 -->
- Resolve exceptions when running knife diff [#8459](https://github.com/chef/chef/pull/8459) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.260 -->
- Chef-15: cookbook compiler should parse only .rb files [#8456](https://github.com/chef/chef/pull/8456) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.259 -->
- Update more brand names to current [#8454](https://github.com/chef/chef/pull/8454) ([tas50](https://github.com/tas50)) <!-- 15.0.258 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dba355adba..5258f0e406 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.260)
+ chef (15.0.261)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.260)
+ chef-config (= 15.0.261)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -56,11 +56,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.260-universal-mingw32)
+ chef (15.0.261-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.260)
+ chef-config (= 15.0.261)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -101,13 +101,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.0.260)
- chef (= 15.0.260)
+ chef-bin (15.0.261)
+ chef (= 15.0.261)
PATH
remote: chef-config
specs:
- chef-config (15.0.260)
+ chef-config (15.0.261)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 1256ed9d25..94fd4c233a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.260 \ No newline at end of file
+15.0.261 \ 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 6392b1232d..6ebfaa4b9d 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.260".freeze
+ VERSION = "15.0.261".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3aeb807e42..50060bb311 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.260".freeze
+ VERSION = "15.0.261".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 793f70f4d9..46ff6bf0cf 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.260")
+ VERSION = Chef::VersionString.new("15.0.261")
end
#