Matthias Radestock
18fc6ccc03
remove redundant code in test
2015-12-09 10:32:14 +00:00
Matthias Radestock
eddcf93942
oops
2015-12-08 23:08:19 +00:00
Matthias Radestock
0b521272ae
prevent peer duplication in tests
...
and correct the test assertions accordingly - they make more sense
now.
Fixes #1766 .
2015-12-08 23:06:02 +00:00
Adam Harrison
af604a1477
Merge pull request #1760 from weaveworks/make-test-tls
...
Move test/tls program into Makefile so it builds inside the build container
2015-12-08 16:41:59 +00:00
Bryan Boreham
c981cff450
Move build of test/tls program into Makefile so it builds in the build container
2015-12-08 16:14:53 +00:00
Adam Harrison
d14d9933b4
Merge pull request #1750 from weaveworks/add-some-quotes
...
quote $@
2015-12-04 10:08:34 +00:00
Adam Harrison
af946893f0
Merge pull request #1749 from weaveworks/remove-eqeq-non-posixism
...
'==' is not POSIX
2015-12-04 10:08:26 +00:00
Matthias Radestock
3909936cc8
cosmetic(ish) use PROXY_PORT
2015-12-02 15:33:38 +00:00
Matthias Radestock
0602c91c54
quote $@
2015-12-02 15:28:41 +00:00
Matthias Radestock
20a48f05b3
fix (harmless) typo
2015-12-02 14:22:23 +00:00
Matthias Radestock
4e70fb7f9d
'==' is not POSIX
2015-12-02 14:20:29 +00:00
Bryan Boreham
74fdf6beec
Merge pull request #1732 from weaveworks/1731-merge-peer-has-short-id
...
update Peer.HasShortID as part of topology merge
Fixes #1731
2015-11-30 15:53:23 +00:00
Adam Harrison
4420057d4f
Merge pull request #1716 from weaveworks/issues/1714-complete-addr-1.3
...
Ensure `weave connect` attempts connection immediately
2015-11-30 13:52:13 +00:00
Matthias Radestock
9dee2f2230
update Peer.HasShortID as part of topology merge
...
This was missing.
There are two parts to this change:
1. updating the Peers.byName mapping when HasShortID changed (in
addition to the existing update on ShortID change). We need to be
careful about the sequencing here - both ShortID and HasShortID must
be set between the calls to deleteByShortID and addByShortID, since
the former is meant to delete the existing entry (hence use the old
values) and the latter add the new entry (hence use the new values).
2. update a peer when the received info has the same version and UID
but the current record has HasShortID=false, and the received info has
HasShortID=true. This caters for the case where we receive an update
about a weave 1.2+ peer first via a pre-1.2 peer (which does not
transmit ShortIDs, and always sets HasShortID=false) and subsequently
via a 1.2+ peer. The former update will force us to communicate with
that peer over the 'sleeve' overlay. We want to accept the latter
update, even though the version is the same, in order to update the
ShortID and HasShortID, so we can switch to fastdp.
Fixes #1731 .
2015-11-29 16:32:50 +00:00
Bryan Boreham
89f27ec99a
Set default port number on address before checking in InitiateConnections, to fix #1714
2015-11-24 14:55:21 +00:00
Adam Harrison
82cf4358ce
Add release v1.3.1
2015-11-23 12:06:10 +00:00
Adam Harrison
2e42d74c59
Merge pull request #1706 from weaveworks/1683-update-docker-1.3
...
Raise minimum Docker version to 1.6
2015-11-20 11:06:00 +00:00
Bryan Boreham
bbf26fc3e8
Raise minimum Docker version to 1.6 to address #1683
2015-11-20 10:44:45 +00:00
Bryan Boreham
385b0aa07f
Fix typo in -tls info string
2015-11-20 10:33:20 +00:00
Bryan Boreham
f2b1ee3398
Merge branch 'latest_release_doc_updates' into 1.3
2015-11-20 10:30:28 +00:00
Bryan Boreham
2a2c60201f
Merge pull request #1699 from weaveworks/issues/1693-fix-proxy-docs-tls-args
...
Fix erroneously hyphenated Docker TLS arguments; Fixes #1693 .
LGTM
2015-11-20 10:27:34 +00:00
Matthias Radestock
ee12b34334
eliminate a gossip inefficiency and dormant bug
...
Fixes #1704
2015-11-19 20:57:27 +00:00
Bryan Boreham
f25af8f7d6
Merge pull request #1698 from weaveworks/1697-copy-on-write-gossip-data
...
make GossipData immutable; Fixes #1697 . Fixes #1450 . Fixes #1452 .
2015-11-19 14:58:32 +00:00
Matthias Radestock
1500b1dc00
refactor: extract nameserver GossipData.copy
...
and remove a self-evident comment
2015-11-18 11:30:40 +00:00
Adam Harrison
9263d3e82c
Fix erroneously hyphenated Docker TLS arguments
2015-11-18 10:24:46 +00:00
Adam Harrison
02b7fd53ed
Merge tag 'v1.3.0' into latest_release_doc_updates
...
Resetting doc update branch for 1.3.0 release.
2015-11-18 10:14:10 +00:00
Matthias Radestock
3cd199e852
make GossipData immutable
...
The same piece of GossipData can be shared and subject to different
Merge operations. We either need to copy the data when we share it, or
create copies on modification, i.e. copy-on-write.
We choose the latter, since it is more efficient and there is just one
mutating operation.
Fixes #1697 .
2015-11-17 20:13:46 +00:00
Bryan Boreham
de802f9d76
Work round docker-py assuming busybox is present ( https://github.com/docker/docker-py/issues/852 )
2015-11-13 11:44:08 +00:00
Bryan Boreham
804e6ba586
Cope with changes in docker-py structure.
...
Tests are now in a different directory,
and get sharded by module rather than individually.
2015-11-13 11:08:57 +00:00
Adam Harrison
af3fc82b77
Add release v1.3.0
2015-11-12 16:49:33 +00:00
Adam Harrison
3bb7036cfd
Runner depends on tools
2015-11-12 16:48:56 +00:00
Bryan Boreham
d802eb485b
Merge pull request #1664 from weaveworks/weave-launch-plugin
...
Add plugin support to weave script. LGTM.
2015-11-12 16:04:41 +00:00
Adam Harrison
b4dd9c2490
Add plugin to features doc
2015-11-12 16:01:01 +00:00
Adam Harrison
04ab198e95
Set restart policy to 'always'
...
Docker attempts to recreate networks on startup which means the plugin
container has to be started. If it isn't started automatically by Docker
with a restart policy, it's not possible to start it manually because
Docker is blocked.
2015-11-12 14:58:54 +00:00
Adam Harrison
c345700963
Add plugin to weave status
2015-11-12 14:58:54 +00:00
Adam Harrison
b21afcb78f
Implement weave launch-plugin and weave stop-plugin
2015-11-12 14:56:13 +00:00
Adam Harrison
7f65530b26
weave setup fetches plugin
2015-11-12 14:56:13 +00:00
Bryan Boreham
b1b03f3a97
Revert "Remove code coverage as temporary work-around to Docker 1.9 issue"
...
This reverts commit 65fe753a58
2015-11-12 11:27:48 +00:00
Bryan Boreham
36ef6d8da2
Merge remote-tracking branch 'origin/1.2'
2015-11-12 11:27:01 +00:00
Bryan Boreham
28bb0dd3b0
Merge pull request #1671 from weaveworks/1666-remove-cont-dir
...
Remove containers directory bind-mount from proxy; fixes #1647 and #1666
2015-11-12 11:25:34 +00:00
Bryan Boreham
79f8a8f909
Merge remote-tracking branch 'origin/1.2'
2015-11-12 10:43:01 +00:00
Bryan Boreham
bfe2513540
Merge pull request #1669 from dpw/fdp-fix-npd
...
Handle the case where Forward returns nil. Fixes #1661 .
2015-11-12 10:38:29 +00:00
Bryan Boreham
2536aef737
Proxy doesn't need to mount the containers dir
2015-11-12 10:28:58 +00:00
Adam Harrison
0661ccdea9
Revert "Revert "Disable restart of docker""
...
This reverts commit 76db732f1b
2015-11-11 10:10:17 +00:00
Adam Harrison
29f7015e58
Merge pull request #1665 from weaveworks/move-odp-helpers
...
Move ODP helper functions out to their own package
2015-11-11 09:56:24 +00:00
David Wragg
7dc1b50d3b
Handle the case where Forward returns nil
...
Forward can return nil if the remote peer has HasShortID false. That
can happen if we learn about a 1.2 peer from a 1.1 peer and attempt to
connect to it.
This change just fixes the panic. HasShortID will never be set, so we'll
fall back to sleeve. But if that occurs, if can be fixed by a restart of
the affected routers.
2015-11-10 23:17:01 +00:00
Bryan Boreham
682133a56a
Move ODP helper functions out to their own package
2015-11-10 17:09:17 +00:00
Adam Harrison
76db732f1b
Revert "Disable restart of docker"
...
This reverts commit a400a3dd09
2015-11-10 10:24:58 +00:00
Matthias Radestock
64aa2b5cc3
refactor: remove weave overlay-isms from mesh
2015-11-09 20:56:04 +00:00
Matthias Radestock
1eed5fd271
cosmetic: don't mention UDP in mesh
2015-11-09 19:47:27 +00:00
Matthias Radestock