Tom Wilkie
58dec7334b
Merge branch '1.1'
2015-10-01 08:23:15 +00:00
Tom Wilkie
0b7af28c86
Typo in Makefile.
2015-10-01 08:21:55 +00:00
Matthias Radestock
725f99ea4c
Merge branch '1.1'
2015-10-01 08:23:52 +01:00
Matthias Radestock
526259ef8e
Merge pull request #1487 from weaveworks/1480-dns-test-race
...
Fix races in TestRecursiveCompress
Fixes #1480 .
2015-10-01 08:11:48 +01:00
Matthias Radestock
4b43cac093
Merge branch '1.1'
2015-09-30 23:34:57 +01:00
Matthias Radestock
3795c14931
better
2015-09-30 22:57:10 +01:00
Matthias Radestock
3e5cdd8bf2
refactor: remove pointless NXDOMAIN tests
2015-09-30 22:42:27 +01:00
Matthias Radestock
35058a1dde
refactor: put negative DNS queries in one test suite
2015-09-30 22:38:48 +01:00
Tom Wilkie
11d93b1883
Fix races in TestRecursiveCompress
2015-09-30 15:51:07 +00:00
Tom Wilkie
f86f392641
Merge pull request #1486 from weaveworks/1482-disable-160
...
Disable 160_claim test.
2015-09-30 16:20:34 +01:00
Tom Wilkie
19cb1ae8e1
Merge branch '1.1'
2015-09-30 15:06:26 +00:00
Matthias Radestock
cd8befe43e
Merge pull request #1485 from weaveworks/1450-check-slice
...
Sanity-check gossip messages
2015-09-30 15:41:21 +01:00
Tom Wilkie
db46204ff9
Disable 160_claim test.
2015-09-30 14:22:24 +00:00
Bryan Boreham
d2290cc82c
Sanity-check gossip messages
2015-09-30 14:39:27 +01:00
David Wragg
f8e06f9dbc
Merge 1286-tool (PR #1470 ): Use test script from build-tools.git
2015-09-30 14:15:20 +01:00
Tom Wilkie
f3dc681f61
Only clean weave packages.
2015-09-30 10:15:50 +00:00
Tom Wilkie
62f62e1fd5
tools.git is now called build-tools.git
2015-09-30 08:21:19 +00:00
Tom Wilkie
f3360e61e1
Remove cover tool, this lives in tools.git now.
2015-09-30 08:21:12 +00:00
Tom Wilkie
5208dcd67e
Review feedback
...
- Use git submodule for tools.
- Update Makefile to use submodules.
- Put submodule at tools/
- Tidy up some obsolete references to tools in .gitignore.
2015-09-30 08:21:08 +00:00
Tom Wilkie
6f7d4a7a01
Use lint from tools.git
...
- Do lint first, on circle.
2015-09-30 08:20:56 +00:00
Tom Wilkie
958a3bbd99
Use test script from tools.git
2015-09-30 07:42:43 +00:00
Matthias Radestock
d5c85a3d53
cosmetic: fix typo
2015-09-29 19:40:54 +01:00
Tom Wilkie
5e7b527af2
Make publish from the right place.
2015-09-29 11:02:46 +00:00
Paul Bellamy
ddbd33a8e3
Merge pull request #1471 from weaveworks/1295-publish
...
Publish latest images from CI on successful builds.
2015-09-29 11:37:44 +01:00
Matthias Radestock
a7dc368191
Merge pull request #1469 from weaveworks/1204-test-container
...
Run tests in a separate container.
Fixes #1204 .
2015-09-29 11:37:25 +01:00
Matthias Radestock
5b1d0c55a0
Merge pull request #1474 from weaveworks/1472-weave-env-debug
...
use a container-local unix socket to get the address, instead of logs
Fixes #1453 . Fixes #1472 .
2015-09-29 11:04:41 +01:00
Matthias Radestock
58515ca36e
make weave(proxy) startup death message more generic
...
...in order to account for `docker logs` not working due to custom
logging drivers.
Partially undoes #958 . Partially fixes #1453 .
2015-09-29 11:02:05 +01:00
Matthias Radestock
2d753ebf1a
cosmetic: reduce confusion w.r.t. meaning of 'connection'
2015-09-29 09:21:39 +01:00
Tom Wilkie
50cd716220
Review feedback.
2015-09-29 07:46:00 +00:00
Matthias Radestock
47c97e8191
refactor: remove some code duplication
2015-09-28 16:10:43 +01:00
Paul Bellamy
d704ba175f
[proxy] use a container-local unix socket to get the address, instead of logs
2015-09-28 16:08:25 +01:00
Matthias Radestock
c1036c5e4f
Merge remote-tracking branch 'upstream/master'
2015-09-28 14:53:12 +01:00
Matthias Radestock
356d06915b
refactor weave script http calls
...
- inline http_call into call_weave
- rename http_call_ip to http_call
- make http_call take the IP & port as one single "address" argument
instead of separate args
2015-09-28 12:43:09 +01:00
Tom Wilkie
2b4fd738da
Review feedback
2015-09-28 09:05:10 +00:00
Tom Wilkie
f9de6df426
Publish latest images from CI on successful builds.
...
This time rebuild without insturmentation first.
2015-09-28 08:27:21 +00:00
Tom Wilkie
8ee409d9bd
Run tests in a separate container.
2015-09-25 06:19:00 +00:00
Matthias Radestock
0cf3de4541
Merge pull request #1446 from weaveworks/smoke-subdomains
...
Add smoke-test for subdomains
2015-09-24 15:55:57 +01:00
Bryan Boreham
3a79be7426
Add smoke-test for subdomains
2015-09-24 14:48:39 +01:00
David Wragg
30589bb580
Mention the mailing list
2015-09-24 14:40:20 +01:00
Matthias Radestock
e07b18bb18
Merge branch '1.1'
2015-09-24 12:08:13 +01:00
Matthias Radestock
63e3f441d8
cosmetic: link to relevant RFC section for ARP announcements
2015-09-24 12:07:12 +01:00
Tom Wilkie
b31eb3db82
Merge remote-tracking branch 'upstream/1.1'
2015-09-24 03:54:09 +00:00
Tom Wilkie
99ae38c9a6
Merge pull request #1467 from weaveworks/docker-machine
...
Update for docker/machine PR #1729
2015-09-24 11:53:21 +08:00
Tom Wilkie
011f96c6a7
New test image using docker 1.8
2015-09-24 03:42:44 +00:00
Tom Wilkie
c7b4136d31
Update for docker/machine PR #1729
2015-09-24 03:25:30 +00:00
Bryan Boreham
da2f98fa8f
Remove workaround for upstream, no longer required
2015-09-23 10:15:06 +01:00
Tom Wilkie
7ac532a1d0
Merge pull request #1454 from weaveworks/1433-docker-1.8
...
New test image using docker 1.8
2015-09-23 10:16:06 +08:00
Matthias Radestock
b98ab70517
Merge branch '1.1'
2015-09-22 21:18:32 +01:00
Matthias Radestock
b1d453a0c2
Merge pull request #1460 from weaveworks/simplify-ipam-cidrs
...
Simplify ipam_cidrs function in weave script
2015-09-22 21:17:42 +01:00
Bryan Boreham
a51f63267a
Merge 0-args case in ipam_cidrs() and simplify loop
2015-09-22 21:06:12 +01:00
Tom Wilkie