summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-08-27 10:51:05 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-08-27 10:51:05 -0700
commita5d6632b7c011b0151a3d69c460c43b4352007e8 (patch)
tree47fcaeab239a44d6934167fb509a87056244138b
parent096f4511f8418b6544ab02f30c0c23eba67bd964 (diff)
parent831909c785953a78409ee0bd869730c7e1c83fc2 (diff)
downloadchef-a5d6632b7c011b0151a3d69c460c43b4352007e8.tar.gz
Merge pull request #3830 from chef/lcg/3743
Lcg/3743
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/chef/provider/remote_directory.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c4153223c..22f02eee2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,10 +22,12 @@
* [**Nate Walck**](https://github.com/natewalck):
[pr#3704](https://github.com/chef/chef/pull/3704): Add SIP (OS X 10.11) support
* [**Phil Dibowitz**](https://github.com/jaymzh):
+ [pr#3805](https://github.com/chef/chef/pull/3805) LWRP parameter validators should use truthiness
+* [**Igor Shpakov**](https://github.com/Igorshp):
+ [pr#3743](https://github.com/chef/chef/pull/3743) speed improvement for `remote_directory` resource
* [pr#3799](https://github.com/chef/chef/pull/3799) fix supports hash issues in service providers
* [pr#3817](https://github.com/chef/chef/pull/3817) Remove now-useless forcing of ruby Garbage Collector run
-* [pr#3805](https://github.com/chef/chef/pull/3805) LWRP parameter validators should use truthiness
* [pr#3774](https://github.com/chef/chef/pull/3774) Add support for yum-deprecated in yum provider
* [pr#3793](https://github.com/chef/chef/pull/3793) CHEF-5372: Support specific `run_levels` for RedHat service
* [pr#2460](https://github.com/chef/chef/pull/2460) add privacy flag
diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb
index eaccce46cf..85ceb5cdae 100644
--- a/lib/chef/provider/remote_directory.rb
+++ b/lib/chef/provider/remote_directory.rb
@@ -67,7 +67,7 @@ class Chef
::File::FNM_DOTMATCH)
# Remove current directory and previous directory
- files.reject! do |name|
+ files = files.reject do |name|
basename = Pathname.new(name).basename().to_s
['.', '..'].include?(basename)
end