Skip to content

[master] Fix S3 connection regression#11721

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-s3-regression
Oct 23, 2014
Merged

[master] Fix S3 connection regression#11721
MorrisJobke merged 1 commit into
masterfrom
fix-s3-regression

Conversation

@PVince81

Copy link
Copy Markdown
Contributor

Fix for #11714 (master version)

Note that on master the unit tests were already broken.
Before fe912ca:
S..EEEEE...............................E...EE...E..EEEEEE.
On this branch:
S..EEEEE...............................E...EE...E..EEEEEE.

@PVince81

Copy link
Copy Markdown
Contributor Author

Seems the amazons3.php files are identical to stable7 (with this fix #11719)

But still, on stable7 the unit tests pass but on master they fail.
The only difference I see is that the AWS client version is different.

Let's merge this PR first then look into the failing unit tests.

Please review @helmutschneider @butonic @LukasReschke

@PVince81

Copy link
Copy Markdown
Contributor Author

@icewind1991

@scrutinizer-notifier

Copy link
Copy Markdown

The inspection completed: No new issues

@ghost

ghost commented Oct 22, 2014

Copy link
Copy Markdown

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

@PVince81

Copy link
Copy Markdown
Contributor Author

Unit test fix is here: #11726 (you can cherry pick it here first if you like)

@PVince81 PVince81 changed the title [master] Fix S3 connection [master] Fix S3 connection regression Oct 22, 2014
@MorrisJobke

Copy link
Copy Markdown
Contributor

From a code point of view this makes totally sense. #11726 is now merged. I will test with this on top of latest master.

cc @LukasReschke

@icewind1991

Copy link
Copy Markdown
Contributor

Tested, code looks good 👍

@MorrisJobke

Copy link
Copy Markdown
Contributor

Works. 👍

MorrisJobke added a commit that referenced this pull request Oct 23, 2014
[master] Fix S3 connection regression
@MorrisJobke
MorrisJobke merged commit 7c14a17 into master Oct 23, 2014
@MorrisJobke
MorrisJobke deleted the fix-s3-regression branch October 23, 2014 10:42
@lock lock Bot locked as resolved and limited conversation to collaborators Aug 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants