Bryan Boreham
934ec2467d
Eliminate race from call_weave; call check_running only after curl fails
2016-04-05 17:54:18 +01:00
Bryan Boreham
ff4d0dae70
Keep going if an IPAM claim errors
2016-04-05 17:54:18 +01:00
Matthias Radestock
bac3d65ede
refactor: use a 'case' for greater clarity
2016-04-05 17:54:18 +01:00
Bryan Boreham
ecb180c0c5
Ignore 404 from IP address claim when IPAM is disabled
2016-04-05 17:54:18 +01:00
Bryan Boreham
f01d91459b
Make http_call send error messages to stderr and return error codes,
...
and fix up all uses of this function.
2016-04-05 17:54:18 +01:00
Matthias Radestock
3e07f03c87
Merge branch '1.4'
2016-04-05 17:26:01 +01:00
Matthias Radestock
28e0b14220
Merge pull request #2128 from weaveworks/issues/2109-skip-empty-json
...
Don't attempt to parse JSON payload if it is 0 bytes long.
Fixes #2109 .
2016-04-05 17:24:37 +01:00
Matthias Radestock
f82ef55c67
Merge branch '1.4'
2016-04-05 17:21:09 +01:00
Matthias Radestock
53ba2f0aff
rename test so it actually gets run
2016-04-05 17:07:07 +01:00
Matthias Radestock
45b36b378d
Merge branch '1.4'
2016-04-05 16:57:47 +01:00
Matthias Radestock
4f1d87f893
Merge pull request #2126 from weaveworks/2090-delay-start
...
Delay notifying observers about 'start' events
Fixes #2090 . Partially addresses #1775 .
2016-04-05 16:48:20 +01:00
Bryan Boreham
66c92fe075
Don't attempt to parse JSON payload if it is 0 bytes long.
...
Also added a test to trigger this.
2016-04-05 16:47:11 +01:00
Bryan Boreham
ebc5dcb4bb
Delay notifying observers about 'start' events
...
...until the container has a pid, or we see the same container die.
This is to work around https://github.com/docker/docker/issues/18574
Fixes #2090 . Partially addresses #1775 .
2016-04-05 16:20:07 +01:00
Bryan Boreham
afff92c248
Merge pull request #2124 from weaveworks/idempotent-tombstone
...
make DNS tombstoning idempotent
2016-04-05 17:15:53 +02:00
Matthias Radestock
ead3518b4b
make DNS tombstoning idempotent
...
so we avoid the unnecessary gossip, and delayed convergence, that
otherwise ensues.
2016-04-04 20:34:01 +01:00
Bryan Boreham
b7d49cdeb7
Merge pull request #2117 from weaveworks/2113-wait-for-dp
...
wait for datapath device to be ready
2016-04-01 12:13:21 +02:00
Matthias Radestock
495a35a6a6
work around fd re-use bug in vishvananda/netlink
...
Closing a subscription can cause the associated fd to be re-used while
the subscription goroutine is also still trying to use it. Which can
have disastrous consequences.
So as a work around we don't close subscriptions. This means we leak
an fd, some buffer space, and goroutine. The latter will eventually
block in a channel send of a subscription event, since nothing is left
reading ont the other end. So at least it won't be consuming cycles.
2016-04-01 11:07:19 +01:00
Bryan Boreham
9f13d28508
Merge pull request #2116 from weaveworks/plugin-coverage
...
add coverage to plugin
2016-04-01 12:01:25 +02:00
Matthias Radestock
de4cc0ad54
eradicate last remaining wEaVeDnS misspellings
2016-03-31 06:39:41 +01:00
Anita Buehrle
7f4c527fc5
Merge pull request #2118 from weaveworks/weaveDNS-fix
...
fixes #2102
2016-03-30 17:02:04 -06:00
Anita Buehrle
8a305ee189
fixes #2102
2016-03-30 17:05:26 -06:00
Matthias Radestock
718e93bd23
add coverage to plugin
2016-03-30 17:40:32 +01:00
Matthias Radestock
254be128b0
cosmetic: consistency
2016-03-30 16:25:26 +01:00
Matthias Radestock
2c49cd1e0a
refactor: s/DOCKERPLUGIN/PLUGIN
...
since it's also a CNI plugin now
2016-03-30 15:43:55 +01:00
Matthias Radestock
ec167554c5
refactor: consistent order
2016-03-30 14:13:41 +01:00
Matthias Radestock
f24f38be9c
refactor: get rid of a superfluous fastdp member
2016-03-30 14:10:03 +01:00
Matthias Radestock
0f89f8562f
refactor(ish): parameterise dp creation by iface, not name
2016-03-30 14:07:33 +01:00
Matthias Radestock
8eb52538de
wait for datapath device
...
so that when the router container restarts after a reboot it waits for
the proxy to create the datapath device.
Fixes #2113
2016-03-30 14:01:57 +01:00
Matthias Radestock
90629bc6d3
add another cross reference.
2016-03-30 00:03:55 +01:00
Matthias Radestock
c6fea4939e
fix broken link
2016-03-30 00:02:30 +01:00
Anita Buehrle
0597162189
Merge pull request #2111 from weaveworks/app-isolation-fix
...
sorted out isolated apps files
2016-03-29 16:42:29 -06:00
Anita Buehrle
74e7d383c9
sorted out isolated apps files
2016-03-29 16:45:20 -06:00
Adam Harrison
051320e73c
Merge branch '1.4'
2016-03-29 11:45:24 +01:00
Adam Harrison
6e04ccf677
Merge pull request #2101 from weaveworks/2099-no-dns
...
make `weave dns-args` and `weave run` work with `--no-dns`
2016-03-29 11:44:12 +01:00
Adam Harrison
436dc01f52
Merge pull request #2070 from weaveworks/issues/1721-quorum-callback
...
Use current target list to compute quorum
2016-03-29 11:11:30 +01:00
Adam Harrison
a6bb02aca1
Merge pull request #2106 from weaveworks/patch-up-2103
...
Patch up #2103
2016-03-29 10:37:04 +01:00
Matthias Radestock
ec5008c702
remove "quote of quote"
2016-03-29 10:31:36 +01:00
Matthias Radestock
3453972ac4
banish ~~~bash
...
Just use indenting, which is much easier on the eye.
2016-03-29 10:30:51 +01:00
Adam Harrison
7c37cd98dd
Merge pull request #2074 from weaveworks/cleanup-plugin-logging
...
clean up plugin logging
2016-03-29 10:02:21 +01:00
Matthias Radestock
a1eb940c51
restore ellipses around weave status output fragments
2016-03-29 05:40:50 +01:00
Matthias Radestock
bd6359dcb1
Merge branch '1.4'
2016-03-29 05:38:35 +01:00
Matthias Radestock
cc75b084d8
Merge branch 'latest_release_doc_updates' into 1.4
2016-03-29 05:36:59 +01:00
Matthias Radestock
bd9314939b
correct weave status proxy output
2016-03-29 05:36:11 +01:00
Anita Buehrle
2298927331
Merge pull request #2103 from weaveworks/spellcheck
...
fixed formatting for wp and spellcheck
2016-03-28 16:27:24 -06:00
Anita Buehrle
b3b93b28df
fixed formatting for wp and spellcheck
2016-03-28 16:30:33 -06:00
Matthias Radestock
d68c1a8187
correct tools submodule reference
...
This got broken in 18f678a3c8
2016-03-28 18:09:08 +01:00
Matthias Radestock
06a525456d
remove bogus link
2016-03-28 17:59:16 +01:00
Matthias Radestock
9d19676ef1
cosmetic(ish): add reference to crypto overview from implementation
2016-03-28 17:58:43 +01:00
Matthias Radestock
540b55a35c
cosmetic(ish): add some references to crypto docs
2016-03-28 17:53:41 +01:00
Matthias Radestock
2f435cfcce
fix/add links to examples when referring to them
2016-03-28 17:44:43 +01:00