 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
|
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 |
|
|
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
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 |
|
|
Bryan Boreham
|
0425d5bf6a
|
Removed duplicated 'name'
|
2016-05-09 14:45:43 +01:00 |
|
|
Bryan Boreham
|
de9597b6fa
|
Merge branch '1.5'
|
2016-05-09 14:38:00 +01:00 |
|
|
Bryan Boreham
|
2fa576f3c0
|
Merge pull request #2265 from weaveworks/issues/2232-block-claim
Make claim block if the IPAM ring is not established. Fixes #2232
|
2016-05-09 14:37:37 +01:00 |
|
|
Adam Harrison
|
fa29a4b4af
|
Document weave status ipam
|
2016-05-09 13:41:42 +01:00 |
|
|
Martynas Pumputis
|
d698aefbfc
|
Make Claim to block if the IPAM ring is not established
|
2016-05-09 12:48:41 +01:00 |
|
|
Matthias Radestock
|
db1ac2a343
|
Merge branch '1.5'
|
2016-05-09 11:50:09 +01:00 |
|
|
Matthias Radestock
|
a3b6380296
|
Merge pull request #2264 from weaveworks/issues/2123-die-another-way
Kill process instead of container, on container restart.
Fixes #2123
|
2016-05-09 11:47:58 +01:00 |
|
|
Bryan Boreham
|
469d456c8b
|
Smoke-test for container restart with proxy attach failure
|
2016-05-09 11:19:19 +01:00 |
|
|
Matthias Radestock
|
438efcccda
|
Merge branch '1.5'
|
2016-05-07 20:19:18 +01:00 |
|
|
Matthias Radestock
|
daa369b86c
|
refactor: extract a couple of helpers in allocator tests
to reduce repetition
|
2016-05-07 20:18:21 +01:00 |
|
|
Matthias Radestock
|
c3a2ea3dd8
|
Merge branch '1.5'
|
2016-05-07 17:57:10 +01:00 |
|
|
Matthias Radestock
|
c54f2959ad
|
Merge pull request #2266 from weaveworks/issues/2233-peer-name-docs
Document peer name
Fixes #2233.
|
2016-05-07 17:56:39 +01:00 |
|
|
Matthias Radestock
|
ac0f284c5f
|
Merge branch '1.5'
|
2016-05-07 14:43:04 +01:00 |
|
|
Matthias Radestock
|
bd06553ce0
|
Merge pull request #2262 from weaveworks/issues/2194-reclaim-plugin-addrs
Reclaim plugin addresses without warning
Fixes #2194
|
2016-05-07 14:41:03 +01:00 |
|
|
Adam Harrison
|
158fa9d8e5
|
Reclaim plugin addresses using container ID of '_'
|
2016-05-07 14:35:15 +01:00 |
|