summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-05 21:29:07 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-05 21:29:07 +0000
commita05cc21d88ce72258e4a58e6d7c98fb584e79382 (patch)
tree5cbc7c0762a5dded4574b8cedd2b46c77f771314
parent8f5c99a5e8ae0cd51c080caf03ba567648582b6b (diff)
downloadchef-a05cc21d88ce72258e4a58e6d7c98fb584e79382.tar.gz
Bump version to 15.0.100 by Chef Expeditorv15.0.100
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-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b49530bf5..4c49a32e88 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.99 -->
-## [v15.0.99](https://github.com/chef/chef/tree/v15.0.99) (2018-12-05)
+<!-- latest_release 15.0.100 -->
+## [v15.0.100](https://github.com/chef/chef/tree/v15.0.100) (2018-12-05)
#### Merged Pull Requests
-- Update InSpec to 3.0.61 and Ohai to 15.0.20 [#8010](https://github.com/chef/chef/pull/8010) ([tas50](https://github.com/tas50))
+- timezone: updated description to include windows [#8018](https://github.com/chef/chef/pull/8018) ([Stromweld](https://github.com/Stromweld))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- timezone: updated description to include windows [#8018](https://github.com/chef/chef/pull/8018) ([Stromweld](https://github.com/Stromweld)) <!-- 15.0.100 -->
- Update InSpec to 3.0.61 and Ohai to 15.0.20 [#8010](https://github.com/chef/chef/pull/8010) ([tas50](https://github.com/tas50)) <!-- 15.0.99 -->
- Fix locking ohai to to the value in the Gemfile.lock [#8014](https://github.com/chef/chef/pull/8014) ([tas50](https://github.com/tas50)) <!-- 15.0.98 -->
- Pin the ohai definition to use the ohai version from Gemfile.lock [#8012](https://github.com/chef/chef/pull/8012) ([tas50](https://github.com/tas50)) <!-- 15.0.97 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 33460eb027..bf88f82f68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 8e3ff7e496ecd1f5890e27f552741b731f72b34c
+ revision: dbbd71fd79de6f03492e69936467412c43463a4e
branch: master
specs:
- ohai (15.0.20)
+ ohai (15.0.25)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.99)
+ chef (15.0.100)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.99)
+ chef-config (= 15.0.100)
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.99-universal-mingw32)
+ chef (15.0.100-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.99)
+ chef-config (= 15.0.100)
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.99)
+ chef-config (15.0.100)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 7934e4764e..8bec815750 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.99 \ No newline at end of file
+15.0.100 \ 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 afe7676c3a..2e95f4948c 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.99".freeze
+ VERSION = "15.0.100".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 612e1dfbce..81b6c096ab 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.99")
+ VERSION = Chef::VersionString.new("15.0.100")
end
#