summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-03-04 18:44:33 +0000
committerChef Expeditor <chef-ci@chef.io>2019-03-04 18:44:33 +0000
commit16e791b44ebbd288014d60fa009c974f7ee0178e (patch)
treeb98755bba3f9dcb92ee10366c14fd5ebd9c66399
parent3bd619d0a34a6262dac45153b4f6e3187552702e (diff)
downloadchef-16e791b44ebbd288014d60fa009c974f7ee0178e.tar.gz
Bump version to 14.11.13 by Chef Expeditorv14.11.13
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 26c62fba08..14060647d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.11.12 -->
-## [v14.11.12](https://github.com/chef/chef/tree/v14.11.12) (2019-03-04)
+<!-- latest_release 14.11.13 -->
+## [v14.11.13](https://github.com/chef/chef/tree/v14.11.13) (2019-03-04)
#### Merged Pull Requests
-- windows_share: Improve path comparison to prevent convering on each run [#8262](https://github.com/chef/chef/pull/8262) ([tas50](https://github.com/tas50))
+- chocolatey_package: use provided options when determing available options to allow using private sources [#8263](https://github.com/chef/chef/pull/8263) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.10.9 -->
### Changes since 14.10.9 release
#### Merged Pull Requests
+- chocolatey_package: use provided options when determing available options to allow using private sources [#8263](https://github.com/chef/chef/pull/8263) ([tas50](https://github.com/tas50)) <!-- 14.11.13 -->
- windows_share: Improve path comparison to prevent convering on each run [#8262](https://github.com/chef/chef/pull/8262) ([tas50](https://github.com/tas50)) <!-- 14.11.12 -->
- Use proper paths on Windows in chef-config [#8261](https://github.com/chef/chef/pull/8261) ([tas50](https://github.com/tas50)) <!-- 14.11.11 -->
- Update libxml2 to 2.9.9 [#8238](https://github.com/chef/chef/pull/8238) ([tas50](https://github.com/tas50)) <!-- 14.11.10 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 59e8d6a8ea..db1651a9ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.12)
+ chef (14.11.13)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.12)
+ chef-config (= 14.11.13)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.11.12-universal-mingw32)
+ chef (14.11.13-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.12)
+ chef-config (= 14.11.13)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -78,7 +78,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.11.12)
+ chef-config (14.11.13)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 9b93025690..aefac30c07 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.12 \ No newline at end of file
+14.11.13 \ 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 b90419ff73..4454c9caba 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 = "14.11.12".freeze
+ VERSION = "14.11.13".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b9a79d53a4..5a291ab622 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("14.11.12")
+ VERSION = Chef::VersionString.new("14.11.13")
end
#