summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-06 00:09:59 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-06 00:09:59 +0000
commit0aa07a34d93b80c8970029bcf0cece322a14dbde (patch)
tree029fe630e1547ea05eeae8e03691d6284254d7d8
parentca3763eddfc59416110fc81463a4d8116ffcec40 (diff)
downloadchef-0aa07a34d93b80c8970029bcf0cece322a14dbde.tar.gz
Bump version to 13.4.13 by Chef Expeditorv13.4.13
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551cf57775..67c1e3a6eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.4.12 -->
-## [v13.4.12](https://github.com/chef/chef/tree/v13.4.12) (2017-09-04)
+<!-- latest_release 13.4.13 -->
+## [v13.4.13](https://github.com/chef/chef/tree/v13.4.13) (2017-09-06)
#### Merged Pull Requests
-- handle apple git [#6359](https://github.com/chef/chef/pull/6359) ([kzw](https://github.com/kzw))
+- Alternate user local logon authentication for remote_file resource [#5832](https://github.com/chef/chef/pull/5832) ([NimishaS](https://github.com/NimishaS))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -12,6 +12,7 @@
- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 -->
#### Merged Pull Requests
+- Alternate user local logon authentication for remote_file resource [#5832](https://github.com/chef/chef/pull/5832) ([NimishaS](https://github.com/NimishaS)) <!-- 13.4.13 -->
- handle apple git [#6359](https://github.com/chef/chef/pull/6359) ([kzw](https://github.com/kzw)) <!-- 13.4.12 -->
- immutablize properly as we deep merge [#6362](https://github.com/chef/chef/pull/6362) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.4.11 -->
- Support an array of keys for apt_repository [#6372](https://github.com/chef/chef/pull/6372) ([gsreynolds](https://github.com/gsreynolds)) <!-- 13.4.10 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fd831228ba..5bb25e3d7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.12)
+ chef (13.4.13)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.12)
+ chef-config (= 13.4.13)
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.4.12-universal-mingw32)
+ chef (13.4.13-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.12)
+ chef-config (= 13.4.13)
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.4.12)
+ chef-config (13.4.13)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -204,7 +204,7 @@ GEM
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
- multi_json (1.12.1)
+ multi_json (1.12.2)
multipart-post (2.0.0)
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
diff --git a/VERSION b/VERSION
index a84e19ecc8..580f7433d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.12 \ No newline at end of file
+13.4.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 369ac53c05..ac81df2696 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.4.12"
+ VERSION = "13.4.13"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e74dcc724b..a3cfb544ed 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.4.12")
+ VERSION = Chef::VersionString.new("13.4.13")
end
#