Bryan Boreham
cfa9b4f638
Assert that paxos quorum is set
2016-03-24 12:06:59 +00:00
Bryan Boreham
e6fd970920
Exclude retry-never peers from quorum
...
Note: includes update to latest version of weaveworks/mesh library.
2016-03-24 12:06:59 +00:00
Bryan Boreham
ad0a5477f9
Reverse order of 'start' and 'connect' in test so we don't hang waiting for consensus
2016-03-24 12:06:59 +00:00
Bryan Boreham
2b617633ae
Compute quorum based on the dynamic number of target peers
2016-03-24 12:06:59 +00:00
Adam Harrison
7776e48a62
Merge branch '1.4'
2016-03-23 18:00:38 +00:00
Adam Harrison
6c0075ab82
Add release v1.4.6
v1.4.6
2016-03-23 17:37:21 +00:00
Matthias Radestock
48534b1e30
unbreak tests
...
Broken in an attempt to help with #2090 .
2016-03-23 17:22:40 +00:00
Matthias Radestock
8b6c5bdae4
unbreak things
2016-03-23 17:05:19 +00:00
Matthias Radestock
b8abb22833
Merge branch '1.4'
2016-03-23 16:39:17 +00:00
Matthias Radestock
ae0a4fef50
Merge pull request #2092 from weaveworks/issues/2083-error-not-panic
...
Change invariant fail on Merge() from panic to error
Fixes #2083 .
2016-03-23 16:38:52 +00:00
Matthias Radestock
4dcec8265d
Merge branch '1.4'
...
(but really replace all the changes, which were in 'mesh', with
vendoring the latest mesh)
2016-03-23 16:30:28 +00:00
Matthias Radestock
8360024e06
Merge pull request #2088 from weaveworks/issues/2087-leave-direct-targets
...
Don't delete targets that seem invalid if they are 'direct' targets
Fixes #2087 .
2016-03-23 16:22:08 +00:00
Bryan Boreham
2e4d56efd6
Suspend connecting to targets that seem invalid, if they are 'direct' targets.
...
Introduce TargetSuspended state to reflect this.
2016-03-23 15:36:55 +00:00
Bryan Boreham
6bc199a8bc
Change invariant fail on Merge() from panic to error
2016-03-23 15:26:26 +00:00
Matthias Radestock
c75cadf007
more correct sudo scoping
...
we want to know whether systemctl can be run when sudoing.
This shouldn't fix #2090 , only give is a different error.
2016-03-23 13:00:04 +00:00
Matthias Radestock
b080224072
Merge branch '1.4'
2016-03-22 16:28:53 +00:00
Matthias Radestock
537868008f
make linter happy
2016-03-22 16:28:25 +00:00
Matthias Radestock
63a9f879fb
Merge branch '1.4'
2016-03-22 14:13:24 +00:00
Matthias Radestock
1664fce9d1
Merge pull request #2081 from weaveworks/issues/2023-override-stale-dns
...
Override stale dns entries received via gossip
Fixes #1867 and #2023 .
2016-03-22 13:47:17 +00:00
Bryan Boreham
c2cf825cdf
Smoke test for stale DNS entries
2016-03-22 12:57:07 +00:00
Bryan Boreham
38a79b7f59
Pick entry with newer tombstone to merge
2016-03-22 12:57:07 +00:00
Bryan Boreham
010766fe9e
Check entries claiming to originate from us against our current data, and override if necessary
2016-03-22 12:57:07 +00:00
Adam Harrison
c09dfe6b5a
Merge pull request #2078 from weaveworks/reify-ipam-config
...
Reify ipam config
2016-03-21 16:12:11 +00:00
Matthias Radestock
d177bb8a47
Merge remote-tracking branch 'upstream/master'
2016-03-21 16:00:19 +00:00
Adam Harrison
a26dd1b1d7
Merge pull request #2072 from weaveworks/2071-ci-coverage-underreporting
...
collect coverage data from ci nodes before teardown
2016-03-21 15:58:03 +00:00
Matthias Radestock
34de08d649
Merge branch '1.4'
2016-03-21 15:56:56 +00:00
Adam Harrison
74d0b3b51e
Merge pull request #2075 from weaveworks/2044-multi-rmpeer
...
make `weave rmpeer` accept a list of peers
2016-03-21 15:55:22 +00:00
Matthias Radestock
6b33f4215b
Merge branch 'latest_release_doc_updates' into 1.4
2016-03-21 15:53:18 +00:00
Matthias Radestock
cc43782d87
Merge pull request #2080 from weaveworks/issues/2061-correct-weave-status
...
Correct IPAM state docs
Fixes #2061 .
2016-03-21 15:49:03 +00:00
Adam Harrison
c2eb900dd3
Correct IPAM state docs
2016-03-21 15:33:37 +00:00
Matthias Radestock
915a72ad18
add a check for "--ipalloc-default-subnet requires --ipalloc-range"
2016-03-21 14:00:51 +00:00
Matthias Radestock
320a8ad15b
extract IPAM config
...
and fix error handling - the "do we have an --ipalloc-range?" check
was not performed in all required cases
2016-03-21 12:03:51 +00:00
Matthias Radestock
cf08b8b1aa
cosmetic: tweak --observer usage text
2016-03-21 12:02:22 +00:00
Bryan Boreham
001322751f
Don't hold Nameserver lock over call out via isKnownPeer
2016-03-21 11:52:13 +00:00
Matthias Radestock
0b3dd35624
cosmetic
2016-03-21 11:08:17 +00:00
Adam Harrison
cdf3e4b98e
Merge pull request #2073 from weaveworks/rmpeer-test
...
add 'rmpeer' test
2016-03-21 11:05:53 +00:00
Adam Harrison
0d10479e8a
Add --observer to weave script help
2016-03-21 11:01:55 +00:00
Matthias Radestock
357d0e918a
Merge pull request #2000 from weaveworks/issues/1998-specify-ipam-seed
...
Allow specification of initial IPAM ring via --ipam-seed
Fixes #1998 .
2016-03-21 10:52:40 +00:00
Adam Harrison
3123418022
Merge pull request #2030 from weaveworks/issues/1992-cni-plugin
...
Implement CNI plugin
2016-03-21 10:51:19 +00:00
Adam Harrison
dcc2d16408
Update mesh dependency for peer name shorthand
2016-03-21 10:27:32 +00:00
Adam Harrison
e9081c6607
Allow specification of initial IPAM ring via --ipam-seed
2016-03-21 09:49:54 +00:00
Matthias Radestock
439e57ca56
make weave rmpeer accept a list of peers
...
This isn't as efficient as it could be. In particular we end up
broadcasting the ipam state for every peer listed. To avoid that we'd
have to change the HTTP API, and would no longer be able to use
'DELETE'. That is just not worth it.
Closes #2044 .
2016-03-20 15:53:45 +00:00
Matthias Radestock
18ddf50b4c
cosmetic
2016-03-20 15:46:05 +00:00
Matthias Radestock
6ebac90cb0
refactor: eliminate dot imports in main packages
2016-03-20 14:34:27 +00:00
Matthias Radestock
5e0231ec5e
refactor(ish): unify logging in docker client wrapper
...
and get rid of some debug logging.
and eliminate a dot import in the process.
2016-03-20 10:40:26 +00:00
Matthias Radestock
c25bfafcb2
refactor: make proxy log via a package-local var
...
which gets rid of a bunch of (dot) imports.
2016-03-20 08:31:23 +00:00
Matthias Radestock
6e4f025d9c
refactor: reduce duplication in nameserver logging
...
and remove a dot import in the process
2016-03-20 08:19:15 +00:00
Matthias Radestock
07ea8a2613
add 'rmpeer' test
2016-03-20 07:16:01 +00:00
Matthias Radestock
f9a0ba82a0
collect coverage data from ci nodes before teardown
...
Fixes #2071 .
2016-03-19 22:43:17 +00:00
Matthias Radestock
4c0fe7b006
take advantage of restart=always in tests
...
This should have been done as part of #2029 .
2016-03-19 17:43:49 +00:00