summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-07 19:31:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-07 19:31:03 +0000
commit96a945264d738f92e579fa2d4e094eddaf3a0d29 (patch)
tree820bf59b9eed0bf1e5a23e6ed7a7685680a33482
parent28f8ad784acd0a36f0118f2d9d9f651c48681ccb (diff)
downloadchef-96a945264d738f92e579fa2d4e094eddaf3a0d29.tar.gz
Bump version to 13.10.2 by Chef Expeditorv13.10.2
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock44
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 29 insertions, 29 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f42ba333c..ce5dae7342 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.10.1 -->
-## [v13.10.1](https://github.com/chef/chef/tree/v13.10.1) (2018-07-23)
+<!-- latest_release 13.10.2 -->
+## [v13.10.2](https://github.com/chef/chef/tree/v13.10.2) (2018-08-07)
#### Merged Pull Requests
-- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker))
-- Bump to 13.10 and add release notes [#7454](https://github.com/chef/chef/pull/7454) ([tas50](https://github.com/tas50))
+- Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball))
<!-- latest_release -->
<!-- release_rollup since=13.10.0 -->
### Changes since 13.10.0 release
#### Merged Pull Requests
+- Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.10.2 -->
- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker)) <!-- 13.10.1 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7bc6d7d914..25deab8459 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.10.1)
+ chef (13.10.2)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.1)
+ chef-config (= 13.10.2)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.10.1-universal-mingw32)
+ chef (13.10.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.10.1)
+ chef-config (= 13.10.2)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.10.1)
+ chef-config (13.10.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -188,15 +188,15 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.9.0)
- mixlib-archive (0.4.8)
+ mixlib-archive (0.4.13)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.13)
tomlrb
mixlib-log (1.7.1)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
+ mixlib-shellout (2.4.0)
+ mixlib-shellout (2.4.0-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
multi_json (1.13.1)
@@ -213,7 +213,7 @@ GEM
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
- net-telnet (0.1.1)
+ net-telnet (0.2.0)
netrc (0.11.0)
nori (2.6.0)
octokit (4.9.0)
@@ -257,22 +257,22 @@ GEM
rake
rake (12.3.1)
rb-readline (0.5.5)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.1)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
+ rspec-support (~> 3.8.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.7.0)
+ rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-support (3.7.1)
+ rspec-support (~> 3.8.0)
+ rspec-support (3.8.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
@@ -305,7 +305,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.75.0)
+ specinfra (2.75.1)
net-scp
net-ssh (>= 2.7)
net-telnet
@@ -410,4 +410,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.16.2
+ 1.16.3
diff --git a/VERSION b/VERSION
index 306c8f502b..beab324ba3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.1 \ No newline at end of file
+13.10.2 \ 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 ad8c8cf232..e8e8ddacb0 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.10.1"
+ VERSION = "13.10.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 90fff15ec2..b7ef81d220 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.10.1")
+ VERSION = Chef::VersionString.new("13.10.2")
end
#