summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-18 10:33:28 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-18 10:33:28 +0000
commite6ee17e5e346e0f7df67d8ee04130b9dd9c49a84 (patch)
tree4dbe23cbbd0fcb5c1b4c2b1cc3a3f3453625bdb7
parent5660d0ebf249794f1591749f0953eccdf0658040 (diff)
downloadchef-e6ee17e5e346e0f7df67d8ee04130b9dd9c49a84.tar.gz
Bump version to 13.6.40 by Expeditorv13.6.40
-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 943b38e01c..34ec4ac26f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.39 -->
-## [v13.6.39](https://github.com/chef/chef/tree/v13.6.39) (2017-12-15)
+<!-- latest_release 13.6.40 -->
+## [v13.6.40](https://github.com/chef/chef/tree/v13.6.40) (2017-12-18)
#### Merged Pull Requests
-- Move docker and git top cookbook tests to travis [#6673](https://github.com/chef/chef/pull/6673) ([scotthain](https://github.com/scotthain))
+- Fix bugs in handling &#39;source&#39; in msu_package and cab_package [#6686](https://github.com/chef/chef/pull/6686) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Fix bugs in handling &#39;source&#39; in msu_package and cab_package [#6686](https://github.com/chef/chef/pull/6686) ([tas50](https://github.com/tas50)) <!-- 13.6.40 -->
- Move docker and git top cookbook tests to travis [#6673](https://github.com/chef/chef/pull/6673) ([scotthain](https://github.com/scotthain)) <!-- 13.6.39 -->
- Modernize the log resource [#6676](https://github.com/chef/chef/pull/6676) ([tas50](https://github.com/tas50)) <!-- 13.6.38 -->
- Avoid a few initializers in resources by using the DSL we have [#6671](https://github.com/chef/chef/pull/6671) ([tas50](https://github.com/tas50)) <!-- 13.6.37 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 66a3459b5e..ed161541b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.39)
+ chef (13.6.40)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.39)
+ chef-config (= 13.6.40)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.39-universal-mingw32)
+ chef (13.6.40-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.39)
+ chef-config (= 13.6.40)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.39)
+ chef-config (13.6.40)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 452a7d9370..8af1cd6c31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.39 \ No newline at end of file
+13.6.40 \ 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 136e525c61..17e1eac603 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 = "13.6.39"
+ VERSION = "13.6.40"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 133a769673..35e2ce5c48 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("13.6.39")
+ VERSION = Chef::VersionString.new("13.6.40")
end
#