Adam Harrison
52377df340
Merge branch '1.5'
2016-05-24 17:10:52 +01:00
Adam Harrison
424d331a32
Merge pull request #2314 from weaveworks/disable-doc-previews
...
Temporarily disable doc previews
2016-05-24 17:10:28 +01:00
Adam Harrison
fbbbb924a3
Temporarily disable doc previews
2016-05-24 16:46:41 +01:00
Matthias Radestock
caeff127c9
Merge branch '1.5'
2016-05-24 11:27:42 +01:00
Bryan Boreham
56145ba518
Merge pull request #2311 from weaveworks/issues/2306-proxy-swarm-pending
...
Flush chunked response header immediately; fixes #2306 .
2016-05-24 10:36:09 +01:00
Adam Harrison
885b6195f6
Flush chunked response header immediately
2016-05-24 08:28:24 +01:00
Bryan Boreham
df3ccd362a
Merge branch '1.5'
2016-05-19 15:58:55 +01:00
Bryan Boreham
5ed18994cd
Send error messages about incompatible bridge settings to stderr
2016-05-19 15:58:15 +01:00
Adam Harrison
4dca07c9ff
Merge pull request #2296 from weaveworks/issues/2284-die-another-way
...
Move kill-on-failure responsibility to caller of weave script
2016-05-18 12:19:44 +01:00
Adam Harrison
b16de0c71e
Merge pull request #2299 from weaveworks/issues/fix-offset-abuse
...
Change the type of entry.Free to address.Count
2016-05-18 12:04:54 +01:00
Adam Harrison
a131703b2d
Merge remote-tracking branch 'origin/1.5'
2016-05-18 10:29:55 +01:00
Adam Harrison
78672db440
Merge pull request #2292 from weaveworks/issues/2286-hang-torpedoes
...
Protect against Docker hanging trying to talk to a non-existent plugin
2016-05-18 10:27:13 +01:00
Adam Harrison
5b4906f822
Merge branch '1.5'
2016-05-18 09:46:01 +01:00
Adam Harrison
ee9f8eec1c
Merge pull request #2291 from weaveworks/issues/refactor-check-attached
...
Refactor wait_for_{proxy,attached}
2016-05-18 09:44:15 +01:00
Adam Harrison
dc0e25a420
Add .ackrc which excludes vendor/ and .pkg/
2016-05-17 10:37:56 +01:00
Martynas Pumputis
85cea672d3
Change the type of entry.Free to address.Count
...
This change is backward compatible, because the underlying types of
address.Offset (the previous type) and address.Count are the same
and the Gob encoder does not require types to exactly correspond.
2016-05-16 15:03:05 +01:00
Bryan Boreham
ff81ecfd41
Move kill-on-failure responsibility to caller of weave script
2016-05-16 13:38:22 +01:00
Martynas Pumputis
ef5f80a05a
Merge pull request #2287 from weaveworks/donate-cidr-aligned
...
Donate CIDR-aligned ranges instead of just slicing at the mid-point.
2016-05-16 12:40:17 +01:00
Bryan Boreham
d551b6b0a8
Review feedback
2016-05-13 16:27:28 +01:00
Bryan Boreham
1ec2c0fb3f
Use a CIDR-aligned CIDR in unit tests
2016-05-13 16:27:28 +01:00
Bryan Boreham
d1e2aa6d36
Use quick.Check instead of many specific tests
2016-05-13 16:27:28 +01:00
Bryan Boreham
64dc7a1f69
Donate power-of-2-aligned ranges instead of just slicing at the mid-point.
...
Also fix up space tests to match.
2016-05-13 16:27:28 +01:00
Bryan Boreham
bc79a9187f
Protect against Docker hanging trying to talk to a non-existent plugin
...
Remove the Unix socket from the filesystem before doing volume
operations, if the plugin is not running.
2016-05-12 15:40:04 +00:00
Martynas Pumputis
02d9c090ed
Add wait_for_attached
2016-05-12 12:25:59 +01:00
Martynas Pumputis
671ed724d5
Move wait_for_proxy to config.sh
2016-05-12 12:15:20 +01:00
Bryan Boreham
f37e742536
Merge branch '1.5'
2016-05-12 11:00:14 +00:00
Bryan Boreham
6c7f860418
Merge pull request #2278 from weaveworks/issues/fix-320-claim-test
...
Fix 320_claim_3_test.sh
2016-05-12 11:59:14 +01:00
Bryan Boreham
79d78ae97b
Merge branch '1.5'
2016-05-12 09:57:48 +00:00
Bryan Boreham
4ff574744e
Use ubuntu:trusty to ensure 'nc' is available
2016-05-12 09:53:29 +00:00
Martynas Pumputis
7c3e937ae8
Fix 320_claim_3_test
2016-05-11 12:18:39 +01:00
Martynas Pumputis
178438c470
Merge branch '1.5'
2016-05-10 17:36:56 +01:00
Martynas Pumputis
632694472c
Merge pull request #2281 from weaveworks/issues/2275-request-order
...
Ignore IPAM requests for space until we have a ring
Fixes #2275
2016-05-10 17:36:26 +01:00
Martynas Pumputis
14e1145972
Merge branch '1.5'
2016-05-10 17:34:08 +01:00
Martynas Pumputis
8df1aa48a5
Merge pull request #2280 from weaveworks/sleep-perchance
...
Move sleep on reset from IPAM Allocator to weave script
2016-05-10 17:33:30 +01:00
Bryan Boreham
16b75f899e
Move sleep on reset from IPAM Allocator to weave script
2016-05-10 16:03:08 +01:00
Bryan Boreham
c3abe4f7b2
If we don't have a ring, just ignore a request for space.
2016-05-10 15:33:13 +01:00
Bryan Boreham
f800813031
Test claim as first operation
2016-05-10 15:32:15 +01:00
Martynas Pumputis
f7bddab4cb
Merge branch '1.5'
2016-05-10 15:27:15 +01:00
Martynas Pumputis
c434345960
Fix typo
2016-05-10 15:24:38 +01:00
Martynas Pumputis
f9157acced
Fix logging
2016-05-10 15:18:10 +01:00
Bryan Boreham
e49bbe176d
Make clear that we want the same universe throughout the test
2016-05-10 13:32:56 +01:00
Adam Harrison
0e694ed6b4
Merge branch '1.5'
2016-05-09 16:37:05 +01:00
Adam Harrison
9dfd7004cc
Document adding new version to checkpoint API
2016-05-09 16:36:32 +01:00
Bryan Boreham
cf6d0c8126
Merge branch '1.5'
2016-05-09 15:48:20 +01:00
Bryan Boreham
3963d4453a
Remove mention of obsolete branch latest_release_doc_updates
2016-05-09 15:48:05 +01:00
Bryan Boreham
99b0b949e8
Merge branch '1.5'
2016-05-09 15:40:12 +01:00
Bryan Boreham
ce5d2a6dd0
Add release v1.5.1
2016-05-09 15:16:21 +01:00
Adam Harrison
801283267a
Merge branch '1.5'
...
Closes #1876 .
2016-05-09 14:58:28 +01:00
Bryan Boreham
a2e301c648
Merge pull request #2263 from weaveworks/issues/1876-weave-status-ipam-docs
...
Document `weave status ipam`. Fixes #1876 .
2016-05-09 14:56:59 +01:00
Bryan Boreham
2249c7c648
Merge branch '1.5'
2016-05-09 14:46:06 +01:00
Adam Harrison