8000 Improve handling of `claim _` by bboreham · Pull Request #2196 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Improve handling of claim _ #2196

Merged
merged 1 commit into from
May 4, 2016
Merged

Improve handling of claim _ #2196

merged 1 commit into from
May 4, 2016

Conversation

bboreham
Copy link
Contributor

This improves the error message from "address 10.32.0.1/12 is already owned by 10.32.0.1" to "address 10.32.0.1/12 already in use". Also the code as it stands would not have removed the 'owned' entry if it was deleted from the plugin.

It does not address the basic point of #2194, which is that the situation does not deserve a diagnostic. When the re-launch does its "claim" operations, it passes in the container ID, which does not match up to the earlier allocation via the plugin.

@bboreham bboreham added this to the 1.5.1 milestone Apr 20, 2016
@rade
Copy link
Member
rade commented Apr 29, 2016

needs rebase

@bboreham bboreham force-pushed the issues/2194-claim-addr branch from ba9390f to 70bd0ad Compare May 3, 2016 14:48
@bboreham
Copy link
Contributor Author
bboreham commented May 3, 2016

rebased

@bboreham bboreham removed their assignment May 3, 2016
@brb brb self-assigned this May 4, 2016
@brb
Copy link
Contributor
brb commented May 4, 2016

LGTM

@brb brb merged commit 9644ed3 into 1.5 May 4, 2016
@brb brb removed their assignment May 4, 2016
@awh awh deleted the issues/2194-claim-addr branch May 6, 2016 09:53
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.

3 participants
0