Bryan Boreham
04e50ff02c
Merge branch '1.2'
2015-11-04 16:40:30 +00:00
Bryan Boreham
e57ccdc858
Merge branch 'latest_release_doc_updates' into 1.2
2015-11-04 16:39:43 +00:00
Bryan Boreham
a73a65b48a
Removed obsolete text referring to mixed auto-manual allocation, and clarify Range printout
2015-11-04 16:36:44 +00:00
Adam Harrison
781c805e10
Merge branch '1.2'
2015-11-04 15:32:17 +00:00
Adam Harrison
7c4af88911
Merge pull request #1606 from weaveworks/issues/1578_ufw_ubuntu
...
Add an iptables rule for letting weaveDNS requests in
2015-11-04 15:30:34 +00:00
Alvaro Saurin
0aca173e96
Add an iptables rule for letting weaveDNS requests in
2015-11-04 14:00:26 +01:00
Matthias Radestock
60db57a41c
refactor: remove duplicate isKnownPeer function
2015-11-03 18:11:53 +00:00
Matthias Radestock
df68f7dcb9
Merge branch '1.2'
2015-11-03 17:56:36 +00:00
Matthias Radestock
e95e3cc29d
Merge pull request #1624 from weaveworks/1593-more-peers
...
Better choice of peers for IPAM to transfer ownership to on `weave reset`
Fixes #1593 .
2015-11-03 17:55:40 +00:00
Bryan Boreham
67e9310cc1
Review feedback
2015-11-03 17:01:27 +00:00
Adam Harrison
94984df047
Merge branch '1.2'
2015-11-03 16:57:15 +00:00
Adam Harrison
861bf953bf
Merge pull request #1629 from weaveworks/1626-expose-names
...
Always add 'weave expose -h' argument to DNS
2015-11-03 16:32:13 +00:00
Bryan Boreham
cf9f715a28
Merge branch '1.2'
2015-11-03 15:31:51 +00:00
Bryan Boreham
08e043fea7
Always add 'weave expose -h' argument to DNS, and add smoke-test for this also
2015-11-03 15:23:28 +00:00
Bryan Boreham
54ba1009d3
Merge pull request #1608 from weaveworks/1600-start-networkmode
...
LGTM. Fixes #1600
2015-11-03 15:14:15 +00:00
Adam Harrison
4a6a46fd7b
Merge pull request #1627 from tomwilkie/mv-scheduler
...
Move scheduler to build-tools.
2015-11-03 14:44:52 +00:00
Adam Harrison
0eb7414f72
Merge pull request #1583 from weaveworks/move-runner-to-tools
...
Remove test runner; it now lives in build-tools.git
2015-11-03 14:44:46 +00:00
Tom Wilkie
c02691a70c
Move scheduler to build-tools.
2015-11-03 14:38:42 +00:00
Bryan Boreham
8742957f75
Tweak naming to be closer to code changes in nameserver
2015-11-03 14:15:49 +00:00
Bryan Boreham
ace372cfc6
More extensive choice of transferee
2015-11-03 12:03:28 +00:00
Bryan Boreham
27c5f5f49f
Fix title of test
2015-11-03 12:03:00 +00:00
Paul Bellamy
ec5a1a3977
When container is started in host (or container) networkMode, we mount a noop weavewait, so it can continue
...
review feedback
2015-11-03 10:18:05 +00:00
Adam Harrison
abc653c87d
Fix merge breakage
2015-11-03 10:13:43 +00:00
Matthias Radestock
30a128c00b
Merge branch '1.2'
2015-11-02 20:58:15 +00:00
Matthias Radestock
77c7963bde
Merge pull request #1615 from weaveworks/1603-resort-in-encode
...
Hold DNS entries sorted case-insensitively until just before sending
Fixes #1603 and #1610 .
2015-11-02 20:57:40 +00:00
Bryan Boreham
b80c1343c3
Take steps to avoid the test timing out
2015-11-02 20:40:17 +00:00
Bryan Boreham
e5c5fbcea3
Hold on to the lower-case version of a hostname, rather than re-computing it every time
2015-11-02 20:40:05 +00:00
Bryan Boreham
fc7d04ce73
Condense Entries unit tests with helper function
2015-11-02 20:03:10 +00:00
Bryan Boreham
35f57b3ed2
Move decoding code next to encoding code
2015-11-02 20:01:40 +00:00
Bryan Boreham
ed9ade05ea
Improve merge asserts
2015-11-02 20:01:40 +00:00
Bryan Boreham
f485b729bc
Hold all entries sorted case-insensitively until just before sending, when we re-sort case-sensitively in Encode()
2015-11-02 20:01:40 +00:00
Bryan Boreham
64f7953423
Add unit test to check outbound mixed-case merging
2015-11-02 20:01:40 +00:00
Bryan Boreham
fc1d837501
Extend unit test to cover mixed-case hostnames and daisy-chained gossip;
...
reduce mock gossip timer to 2 seconds to trigger more often during tests.
2015-11-02 20:01:40 +00:00
Matthias Radestock
6a238818da
Merge branch '1.2'
2015-11-02 19:58:37 +00:00
Matthias Radestock
9800c43bfa
refactor(ish): don't use reference in method that doesn't modify
2015-11-02 19:57:17 +00:00
Bryan Boreham
b3cda39b0b
Let IPAM pick any peer we know about to transfer ownership to, when shutting down
2015-11-02 18:34:58 +00:00
Adam Harrison
7e1b7a2fcd
Merge branch '1.2'
2015-11-02 17:28:31 +00:00
Adam Harrison
ccae8d42fd
Merge remote-tracking branch 'dpw/fdp-probe-vxlan' into 1.2
...
Fixes #1599
2015-11-02 17:24:52 +00:00
David Wragg
38f78286c7
Probe whether the kernel has ODP vxlan support
...
It's possible to build that kernel with openvswitch, and vxlan, but
without the vport_vxlan module that glues them together. And at
least one distro has actually done this.
2015-11-02 15:53:16 +00:00
Adam Harrison
c3a53a6ec5
Merge remote-tracking branch 'upstream/1.2'
2015-11-02 15:21:06 +00:00
Bryan Boreham
2bbe6a2ad8
Merge pull request #1622 from weaveworks/fix-miekg-dns-truncation-test
...
LGTM
2015-11-02 15:09:57 +00:00
Adam Harrison
f64f63f675
Handle truncated responses from upstream servers
2015-11-02 15:00:02 +00:00
Adam Harrison
f0fb44f6d4
Update unit test for miekg DNS API change
2015-11-02 13:24:04 +00:00
Paul Bellamy
fa972615e6
Merge pull request #1616 from weaveworks/1549-inspect-wait
...
Make inspect-rewrite wait for start
2015-11-02 11:00:23 +00:00
Bryan Boreham
f7cb2ef25d
have waitForStartByIdent() return an error
2015-10-30 13:46:30 +00:00
Bryan Boreham
949f8bb2e7
Move updateContainerNetworkSettings() into proxy
2015-10-30 13:34:16 +00:00
Bryan Boreham
5eaff802d4
Make inspect-rewrite wait if the start operation is still in progress
2015-10-30 13:34:16 +00:00
Matthias Radestock
b37d428726
Merge branch '1.2'
2015-10-30 01:31:16 +00:00
Matthias Radestock
a6336149f8
guard against chef not running
...
Provisioning on ubuntu/wily64 was tripping over this.
2015-10-30 01:29:21 +00:00
Matthias Radestock
12f5ec40b5
refactor: reduce coupling of nameserver to router
...
The nameserver no longer knows anything about router.Peers and
router.Peer. That only leaves PeerName, Gossip and GossipData.
2015-10-29 23:21:07 +00:00
Bryan Boreham