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 merge artifact #323

Merged
merged 1 commit into from
May 31, 2019
Merged

Fix merge artifact #323

merged 1 commit into from
May 31, 2019

Conversation

mpenkov
Copy link
Collaborator

@mpenkov mpenkov commented May 31, 2019

Two separate PRs were touching the same code. [1] modified the bucket
handling to perform it at module load time. In the meanwhile, [2] fixed
a broken test by relying on functionality that wasn't around after [1]
got merged.

[1] #318
[2] #322

Two separate PRs were touching the same code. [1] modified the bucket
handling to perform it at module load time. In the meanwhile, [2] fixed
a broken test by relying on functionality that wasn't around after [1]
got merged.

[1] #318
[2] #322
@mpenkov mpenkov merged commit a7fecfa into piskvorky:master May 31, 2019
@mpenkov mpenkov deleted the fix-merge-artifact branch May 31, 2019 03:58
@piskvorky
Copy link
Owner

Our build badge is still red with "failing", but this time socket.timeout: The read operation timed out.

@mpenkov
Copy link
Collaborator Author

mpenkov commented May 31, 2019

I think it was an intermittent issue. I restarted the job and it's now all green.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants