Matthias Radestock
6655974ef3
cosmetic: tidy up log messages
2015-08-28 09:12:42 +01:00
Matthias Radestock
cdf4fb605a
Merge branch '1.0'
2015-08-27 20:04:04 +01:00
Michael Bridgen
bca31c7335
Merge pull request #1365 from weaveworks/1356_ignore_interface_deletion_errors_in_weave_reset
...
ignore interface deletion errors during `weave reset`
2015-08-27 15:38:16 +01:00
Michael Bridgen
8b5992e43f
Merge pull request #1290 from weaveworks/labels
...
Add role label to weave containers so scope can filter
2015-08-27 15:00:15 +01:00
Tom Wilkie
42b64f826b
Merge pull request #1358 from weaveworks/1357-dns-reverse-tombstone
...
Make reverse dns lookups honor tombstones.
2015-08-27 14:25:23 +01:00
Tom Wilkie
95379b0c5a
Add works.weave.role=system label to weave containers.
2015-08-27 12:22:34 +00:00
Matthias Radestock
f5918a3c14
remove dead code
...
since #1248
2015-08-27 08:42:48 +01:00
Matthias Radestock
1df752cd33
ignore interface deletion errors during weave reset
...
These can occur when a container dies during `weave reset`.
Fixes #1356 .
2015-08-27 07:54:51 +01:00
Tom Wilkie
a1f5d90323
Merge pull request #1363 from weaveworks/1362-fix-quoted-params
...
Fix test 295
2015-08-26 13:46:49 +01:00
Bryan Boreham
5289a380f2
Use $* instead of $@ to get the desired quoting
2015-08-26 12:31:38 +01:00
Tom Wilkie
914c88454d
Review feedback
2015-08-25 16:53:21 +00:00
Tom Wilkie
46363f4129
Make reverse dns lookups honor tombstones.
2015-08-25 12:01:09 +00:00
Michael Bridgen
bd19b86259
Merge pull request #1352 from weaveworks/doc-format
...
Small improvements in features doc
2015-08-25 12:56:56 +01:00
Tom Wilkie
db2e7e4ba1
Merge pull request #1355 from weaveworks/1343-docker-bridge-in-resolv-conf
...
Pass docker bridge ip to dns server, and filter it out of upstream dns ips.
2015-08-25 09:48:06 +01:00
Bryan Boreham
760f419e8f
Merge pull request #1354 from weaveworks/1347-dns-tombstone-comment
...
Lgtm. Closes #1347
2015-08-24 17:05:54 +01:00
Tom Wilkie
58ae0cd113
Pass docker bridge ip to dns server, and filter it out of upstream dns ips.
2015-08-24 16:00:26 +00:00
Tom Wilkie
4809c113b3
Update comment.
2015-08-24 15:43:31 +00:00
Ilya Dmitrichenko
6d0db90f43
Revert "Merge pull request #1337 from weaveworks/1295-push-on-green"
...
This reverts commit 5054805ac6 , reversing
changes made to 396df6bcda .
2015-08-24 14:22:36 +01:00
Ilya Dmitrichenko
75fb8f6ebf
Revert "need to be in gopath to run make publish"
...
This reverts commit 130cf6eb2b .
2015-08-24 14:22:29 +01:00
Bryan Boreham
26739463a4
Escape a minus character to stop it being taken as a bullet, and clarify which example we are talking about
2015-08-24 14:19:14 +01:00
Paul Bellamy
130cf6eb2b
need to be in gopath to run make publish
2015-08-24 11:10:59 +01:00
Paul Bellamy
5054805ac6
Merge pull request #1337 from weaveworks/1295-push-on-green
...
Publish latest images from CI on successful builds.
2015-08-24 10:58:14 +01:00
Matthias Radestock
396df6bcda
Merge pull request #1348 from weaveworks/1345-1332-dns-response-size
...
Unify logic to tell if DNS response is too big.
Fixes #1345 , fixes #1332
2015-08-21 14:03:00 +01:00
Matthias Radestock
58dafbfa9d
Merge pull request #1344 from weaveworks/refactor-dns-handlers
...
Refactor dns handlers
2015-08-21 13:44:57 +01:00
Tom Wilkie
8516ab7c69
Unify logic to tell if DNS response is too big.
2015-08-21 12:39:12 +00:00
Matthias Radestock
2284bc2120
move error response construction to handler
...
and implement it in terms of existing functions, plus provide a
convenience method for sending the rather common NameError.
2015-08-21 12:09:22 +01:00
Matthias Radestock
31a490bfe6
ensure that make publish publishes up-to-date images
...
otherwise the git revision based image tag doesn't match what is in
the image.
2015-08-21 09:34:08 +01:00
Matthias Radestock
0b5f5fd74e
extract response writing
2015-08-20 20:24:12 +01:00
Matthias Radestock
9a7abe68fd
optimise response construction when no truncation is required
...
no need to do a binary search if all the answers fit
2015-08-20 20:18:56 +01:00
Matthias Radestock
2ea27ec08f
simplify response truncation
2015-08-20 19:55:19 +01:00
Matthias Radestock
322441d5c8
inline truncateResponse
2015-08-20 19:55:19 +01:00
Matthias Radestock
7c7c302920
extract response construction
2015-08-20 19:17:03 +01:00
Matthias Radestock
69986e77dd
cosmetic
2015-08-20 18:46:55 +01:00
Matthias Radestock
8182022d52
refactor dns handlers
...
introduce a handler struct, which
- enables lifting of all the handle* closures to methods
- eliminates the passing around of defaultMaxResponseSize
- reduces the number of free-floating functions
2015-08-20 18:27:58 +01:00
Matthias Radestock
b075e93319
Merge pull request #1324 from weaveworks/1321_elminate_misleading_flag_parsing_error
...
eliminate misleading flag parsing error
Fixes #1321 .
2015-08-20 17:34:32 +01:00
Matthias Radestock
fd6d15e712
eliminate misleading flag parsing error
...
The standard mflags error reporting produces s.t. like
```
flag provided but not defined: -p
See '/home/weave/weaver --help'.
```
on stderr. This is misleading since the program name is container
local, so not something the user actually invoked.
Fixes #1321 .
2015-08-20 17:19:48 +01:00
Matthias Radestock
f399c3a888
Merge branch '1.0'
...
Conflicts:
ipam/ring/ring_test.go
2015-08-20 16:32:09 +01:00
Matthias Radestock
79d1c404a7
Merge pull request #1342 from weaveworks/1336-fix-ring-fuzztest
...
Fix ring fuzz-test
Fixes #1336 .
2015-08-20 16:25:50 +01:00
Adam Harrison
1e83e7a95c
Merge branch '1.0'
2015-08-20 15:33:59 +01:00
Adam Harrison
086ab9d126
Correct MaxUDPPacketSize constant
2015-08-20 15:22:10 +01:00
Tom Wilkie
8a7821a15b
Publish latest images from CI on successful builds.
2015-08-20 14:20:32 +00:00
Bryan Boreham
135c34a45a
Don't remove peer from table until after we've copied its entries out
2015-08-20 13:11:51 +01:00
Bryan Boreham
ca6e54890c
Fix Transfer() when removing a peer, so we actually target the other peer.
2015-08-20 13:11:51 +01:00
Tom Wilkie
dac219b64a
Merge pull request #1339 from weaveworks/revert-1338-1336-check-len
...
Revert "In ipam ring unit test, check if we have any peers with entri…
2015-08-20 12:23:06 +01:00
Tom Wilkie
790a1757e0
Revert "In ipam ring unit test, check if we have any peers with entries to avoid crash "
2015-08-20 12:18:34 +01:00
Tom Wilkie
aafa0f6783
Merge pull request #1338 from weaveworks/1336-check-len
...
In ipam ring unit test, check if we have any peers with entries to avoid crash
2015-08-20 12:15:27 +01:00
Bryan Boreham
df5426dd8b
Check if we have any peers with entries, to avoid crash
2015-08-20 11:57:56 +01:00
Adam Harrison
3803d79835
Merge pull request #1335 from weaveworks/1328_handle_invalid_status_sub_command
...
better error handling for invalid `weave status` sub-command
2015-08-20 11:48:01 +01:00
Matthias Radestock
ceff3bed28
better error handling for invalid weave status sub-command
...
instead of showing '404 page not found'
Fixes #1328 .
2015-08-20 11:14:59 +01:00
Matthias Radestock
eebdbe226b
Merge pull request #1325 from weaveworks/1322_handle_usage_locally
...
deal with `weave --help|help` locally
Fixes #1322 .
2015-08-20 10:13:45 +01:00