summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-20 07:00:19 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-20 07:00:19 +0000
commitb48d39a84143e6619012ee6fac65f4a06883d245 (patch)
tree8bb8ab3cd8de9b9e63011c0b756decdd15fda698
parent4d5ba6e87038163eb94ea577d8cf7d84f59af515 (diff)
downloadchef-b48d39a84143e6619012ee6fac65f4a06883d245.tar.gz
Bump version to 15.0.115 by Chef Expeditorv15.0.115
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 0f037944f3..e30075e7c4 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.114 -->
-## [v15.0.114](https://github.com/chef/chef/tree/v15.0.114) (2018-12-19)
+<!-- latest_release 15.0.115 -->
+## [v15.0.115](https://github.com/chef/chef/tree/v15.0.115) (2018-12-20)
#### Merged Pull Requests
-- windows_certificate: Fix failures in delete action fails if certificate doesn&#39;t exist [#8000](https://github.com/chef/chef/pull/8000) ([Vasu1105](https://github.com/Vasu1105))
+- Disable s3 omnibus cache [#8068](https://github.com/chef/chef/pull/8068) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Disable s3 omnibus cache [#8068](https://github.com/chef/chef/pull/8068) ([tas50](https://github.com/tas50)) <!-- 15.0.115 -->
- windows_certificate: Fix failures in delete action fails if certificate doesn&#39;t exist [#8000](https://github.com/chef/chef/pull/8000) ([Vasu1105](https://github.com/Vasu1105)) <!-- 15.0.114 -->
- Bump license_scout to 1.0.20 for licensing tests [#8065](https://github.com/chef/chef/pull/8065) ([tas50](https://github.com/tas50)) <!-- 15.0.113 -->
- Update inspec to 3.1 and bump all the mixlibs [#8062](https://github.com/chef/chef/pull/8062) ([tas50](https://github.com/tas50)) <!-- 15.0.112 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6420e79ed2..e9d77f1b42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.114)
+ chef (15.0.115)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.114)
+ chef-config (= 15.0.115)
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.114-universal-mingw32)
+ chef (15.0.115-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.114)
+ chef-config (= 15.0.115)
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.114)
+ chef-config (15.0.115)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index b4a0abf7e5..5193803c4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.114 \ No newline at end of file
+15.0.115 \ 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 e6d041f1c7..3868c5b6b0 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.114".freeze
+ VERSION = "15.0.115".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 12692d1e34..ff7da56bc9 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.114")
+ VERSION = Chef::VersionString.new("15.0.115")
end
#