-
Notifications
You must be signed in to change notification settings - Fork 44
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
Rebase of PR 170 #226
Merged
josecelano
merged 14 commits into
torrust:develop
from
josecelano:issue-156-fix-random-test-failure-due-to-port-collision
Mar 9, 2023
Merged
Rebase of PR 170 #226
josecelano
merged 14 commits into
torrust:develop
from
josecelano:issue-156-fix-random-test-failure-due-to-port-collision
Mar 9, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…iguration::ephemeral` calls
80e84f3
to
4ad9815
Compare
Thank you @josecelano ! it can be merged as is :) |
ACK 4ad9815 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi @WarmBeer, I've rebased your PR, fixing all merge conflicts.
Do you want to rewrite the history of your changes or can we merge it as it's is?
Now you can rewrite your commits if you want to, with the following:
As you mentioned here.