Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix S3 copy and rename overwriting target directory #10104

Merged
merged 4 commits into from
Oct 1, 2014
Merged

Conversation

icewind1991
Copy link
Contributor

Also skip a test for unsupported feature (mtime update of changed directory)

With this the unit tests for S3 pass for me locally.

cc @butonic @DeepDiver1975

@ghost
Copy link

ghost commented Aug 1, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6513/

@@ -52,7 +52,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
/**
* @var int
*/
private $timeout = 15;
private $timeout = 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason that it defaults to 15 in the constructor below (https://github.com/owncloud/core/pull/10104/files#diff-440d6acd86f4ca1cb35ebcdaaaed8e54R93) but it was changed to 1 here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it during debuging, reverted the change

@scrutinizer-notifier
Copy link

A new inspection was created.

@ghost
Copy link

ghost commented Sep 17, 2014

🚀 Test Passed. 🚀
Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org/job/pull-request-analyser/7427/

@butonic
Copy link
Member

butonic commented Oct 1, 2014

👍

@icewind1991
Copy link
Contributor Author

cc @DeepDiver1975 @th3fallen

@LukasReschke
Copy link
Member

👍

LukasReschke added a commit that referenced this pull request Oct 1, 2014
Fix S3 copy and rename overwriting target directory
@LukasReschke LukasReschke merged commit 001f223 into master Oct 1, 2014
@LukasReschke LukasReschke deleted the s3-overwrite branch October 1, 2014 11:07
@LukasReschke
Copy link
Member

Does this need a backport?

@butonic
Copy link
Member

butonic commented Oct 1, 2014

yes, I'll do that

@butonic
Copy link
Member

butonic commented Oct 1, 2014

done a47f965, 25d003a, 67b9ede, 3a4ac2c

@lock lock bot locked as resolved and limited conversation to collaborators Aug 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants