Tom Wilkie
43f8d073db
Update tools for misspell.
2016-03-23 16:05:13 +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
Matthias Radestock
cddef7cae5
Merge remote-tracking branch 'upstream/master'
2016-03-19 17:36:38 +00:00
Matthias Radestock
197f4165a3
cosmetic: move IPAM tests into 3xx range
2016-03-19 17:35:18 +00:00
Bryan Boreham
4a2affabb5
Clean up so test will run again on same host
2016-03-19 16:35:45 +00:00
Matthias Radestock
211e527d3f
Merge pull request #2069 from weaveworks/issues/2047-go-via-actor
...
Avoid data race in TestSpaceRequest
Fixes #2047 .
2016-03-19 16:09:42 +00:00
Bryan Boreham
09a6c2eda0
Get the owned ranges for test purposes via the actor loop, so we don't set off the race detector
2016-03-19 15:29:34 +00:00
Bryan Boreham
71ec252298
Merge pull request #2066 from weaveworks/2058-idempotent-rmpeer
...
make 'rmpeer' report on size of transferred range, and not fail
2016-03-19 15:10:58 +00:00
Matthias Radestock
9f10b21c9c
use Space.NumFreeAddresses for calculating transferred ip count
...
...rather than Space.NumFreeAddressesInRange; we don't care about the
universe.
Alternatively we could make Space.AddRanges return the count. But
AddRanges doesn't know whether the ranges overlap with existing free
space - that is only guaranteed by the context - so would have to do
much the same before/after calculation.
Another alternative would be to add the range sizes in
AdminTakeoverRanges. But that is more code and less clear.
2016-03-19 14:41:36 +00:00
Matthias Radestock
62d823850c
make rmpeer report on size of transferred space, and not fail
...
Closes #2058 .
2016-03-19 14:40:26 +00:00
Matthias Radestock
c48eefa82d
refactor(ish): extract allocator logging commonality
...
and add warnf
2016-03-19 14:32:54 +00:00
Matthias Radestock
65eff683dd
Merge branch '1.4'
2016-03-19 14:30:38 +00:00
Bryan Boreham
b1ec2b788a
Bump template name so it will fetch latest Docker
2016-03-19 14:12:17 +00:00
Matthias Radestock
f42e275884
broadcast ipam ring update after rmpeer
...
So that other peers notice the change more promptly.
Fixes #2068 .
2016-03-19 13:57:20 +00:00
Matthias Radestock
8ce6d3863e
Merge pull request #2067 from weaveworks/address-count
...
Add address.Count type
2016-03-19 12:04:02 +00:00