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

[stable14] always query the lookup server in a global scale setup #11800

Merged
merged 4 commits into from Oct 24, 2018

Conversation

@schiessle
Copy link
Member

@schiessle schiessle commented Oct 12, 2018

backport of #11714

I added the "developing" label as a indicator that you can ignore it until the master pr is merged. But please keep it open. So that in the unlikely case that this will not be merged before we are approaching 14.0.4 we have the PR with the milestone as a reminder that there is something which should be part of the release.

schiessle added 4 commits Oct 9, 2018
…er label

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Oct 12, 2018

I added the "developing" label as a indicator that you can ignore it until the master pr is merged. But please keep it open. So that in the unlikely case that this will not be merged before we are approaching 14.0.4 we have the PR with the milestone as a reminder that there is something which should be part of the release.

Don't worry I always go through all the "backport-request" PRs upon the arrival of a new maintenance release. It's just a mess to keep two branches in sync just for the reminder. THat's the reason I closed the other one. We do this way with so many PRs. So we are quite skilled to handle it this way. 😉 But because it is you I will keep it open. But for the next time you know that we will not forget to backport your PR. 🎉

@schiessle
Copy link
Member Author

@schiessle schiessle commented Oct 12, 2018

It's just a mess to keep two branches in sync just for the reminder.

Don't worry, I will take care of it. 🙂 As long as it is labeled as "in development" it is also not a problem if it is not always 100% in sync.

Copy link
Member

@rullzer rullzer left a comment

Code makes sense.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

🐘

@MorrisJobke MorrisJobke merged commit e5814bd into stable14 Oct 24, 2018
1 check failed
1 check failed
continuous-integration/drone/pr the build failed
Details
@MorrisJobke MorrisJobke deleted the lookupserver-and-global-scale-stable14 branch Oct 24, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 13, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants