Paul Bellamy
2be69634df
replace proxy /weave endpoint with /status
...
which is more standard with others, and doesn't conflict with docker api
2015-05-29 15:48:33 +01:00
Tom Wilkie
6e2bb075a6
Merge pull request #797 from weaveworks/timeout
...
Various fixes to circleci integration tests
2015-05-29 13:57:42 +01:00
Paul Bellamy
587a56cf31
Merge remote-tracking branch 'upstream/0.11'
...
Conflicts:
weave
2015-05-29 13:37:21 +01:00
Tom Wilkie
0a945a04f3
Add smarter scheduler to decide which tests to run on which shard on circle.
2015-05-29 12:35:43 +00:00
Matthias Radestock
10a9f58d13
Merge pull request #780 from paulbellamy/proxy-launch-2
...
simplifying and standardizing `launch-proxy`
Fixes #767 . Fixes #755 . Closes #757 .
2015-05-29 13:30:30 +01:00
Tom Wilkie
332a1bf58d
Checkin the assert.sh script, so we can expose test run time.
2015-05-29 11:48:49 +00:00
Bryan Boreham
0ab2263a41
Merge pull request #793 from bboreham/ipam-avoid-unittest-races
...
[ipam] Fix race conditions in unit tests
2015-05-29 12:30:39 +01:00
Tom Wilkie
3642dc5514
Add some timeouts to the circle/gce tests.
2015-05-29 11:29:43 +00:00
Tom Wilkie
28781ef08c
Don't pull weavebuild container from docker hub if you don't have a cached version, build it.
2015-05-29 11:28:58 +00:00
Bryan Boreham
adeb0d3934
Don't bypass the actor mechanism in unit tests, to avoid race conditions
2015-05-29 10:43:19 +01:00
Bryan Boreham
0ee872def4
Lock round mockGossipComms to avoid race conditions
2015-05-29 10:27:17 +01:00
Paul Bellamy
db217cd56f
Merge pull request #785 from rade/710_reduce_interface_check_interval
...
reduce interface availability check interval
2015-05-29 10:17:13 +01:00
Bryan Boreham
2befd9d473
Merge remote-tracking branch 'origin/0.11'
2015-05-29 09:56:53 +01:00
Paul Bellamy
22aa1f8fe3
Merge pull request #790 from rade/754_stop_proxy
...
add `weave stop_proxy`
2015-05-29 09:53:32 +01:00
Paul Bellamy
f919ef12d0
fix bug with WEAVEPROXY_DOCKER_ARGS not being passed through
2015-05-29 09:52:43 +01:00
Paul Bellamy
20c9bc04a7
simplifying and standardizing launch-proxy
2015-05-29 09:52:42 +01:00
Bryan Boreham
e37f7de0ad
Improve error reporting of too much free space
2015-05-29 09:44:24 +01:00
Bryan Boreham
72b30bc699
Fix incorrect calculation of free space
...
when granting a range that spans a token and inserting a new token, the
free space on the last token that we are handing over has to change.
Add unit test for this too.
2015-05-29 09:44:14 +01:00
Bryan Boreham
10c3f47bd1
Merge pull request #783 from bboreham/782-space-panic
...
Fixes #782
2015-05-29 09:42:44 +01:00
Matthias Radestock
e31f21a6d2
add weave stop_proxy
...
Closes #754 .
2015-05-29 09:20:56 +01:00
Matthias Radestock
c87da5e873
Merge pull request #789 from rade/784_status_fail
...
make `weave status` fail when weave isn't running
Closes #784 .
2015-05-28 23:08:43 +01:00
Matthias Radestock
b0633281a1
make weave status fail when weave isn't running
...
but still always show weavedns status, if present
Closes #784 .
2015-05-28 21:41:56 +01:00
Matthias Radestock
8dcdf8d314
reduce interface availability check interval
...
in order to reduce container startup times
Closes #710 .
2015-05-28 19:05:09 +01:00
Bryan Boreham
915bf392e9
Improve error reporting of too much free space
2015-05-28 18:15:04 +01:00
Bryan Boreham
af5531cbf6
Fix incorrect calculation of free space
...
when granting a range that spans a token and inserting a new token, the
free space on the last token that we are handing over has to change.
Add unit test for this too.
2015-05-28 18:12:30 +01:00
Paul Bellamy
e3e5934c51
Merge remote-tracking branch 'upstream/0.11'
...
Conflicts:
proxy/common.go
2015-05-28 17:43:30 +01:00
Matthias Radestock
32c35da402
Merge pull request #777 from paulbellamy/proxy-versionless
...
allow proxy to intercept unversioned (i.e. 1.0) urls
Closes #770 . Closes #778 .
2015-05-28 17:19:46 +01:00
Matthias Radestock
8dc5ae662a
simplify dependencies
...
This isn't as precise, but these common dependencies rarely change.
2015-05-28 17:16:22 +01:00
Matthias Radestock
ec6a251b7c
fix dependencies
2015-05-28 17:10:42 +01:00
Paul Bellamy
147c7f503c
add curl test for proxy v1.0 api support
2015-05-28 16:39:32 +01:00
Paul Bellamy
c8b95a2527
fix bug in proxy handling of minimal request bodies
2015-05-28 16:24:04 +01:00
Paul Bellamy
169eb19523
allow proxy to intercept unversioned (i.e. 1.0) urls
2015-05-28 16:24:02 +01:00
Adam Harrison
ed133dfe0d
Merge pull request #773 from inercia/weave-restore-fallback
...
Restore the "--fallback" argument in WeaveDNS
2015-05-28 16:12:54 +01:00
Matthias Radestock
374b4c523c
cosmetic: remove some more dead code
2015-05-28 15:24:51 +01:00
Matthias Radestock
9c71f7f1e9
cosmetic: remove some more dead code
2015-05-28 15:23:34 +01:00
Matthias Radestock
ba064a906e
cosmetic: remove dead code
2015-05-28 15:17:20 +01:00
Alvaro
5c1297d560
Merge pull request #775 from rade/736_load_balancing_example
...
add load balancing example
2015-05-28 16:01:55 +02:00
Matthias Radestock
323229dacf
add load balancing example
...
Closes #736 .
2015-05-28 14:58:04 +01:00
Matthias Radestock
0b48ea01d7
cosmetic
2015-05-28 14:48:08 +01:00
Matthias Radestock
54d34ea796
expand weavedns example to cover multi-host
2015-05-28 13:36:32 +01:00
Matthias Radestock
ccd7153b9d
refactor: remove excessive escaping
2015-05-28 12:29:58 +01:00
Paul Bellamy
4f89ad2342
Merge pull request #769 from rade/768_shorten_proxy_entrypoint
...
shorten proxy entrypoint
2015-05-28 12:16:24 +01:00
Matthias Radestock
0ed1ef1600
Merge pull request #764 from paulbellamy/status-connection-maker
...
Add "Direct Peers" to weave status
Closes #659 . Closes #660 .
2015-05-28 12:02:47 +01:00
Alvaro Saurin
7202f7e1d6
Restored "fallback" argument for forcing a fallback server (used for testing/debugging)
2015-05-28 12:57:24 +02:00
Paul Bellamy
998130fa9e
Reformatting connection maker target JSON output
...
So `LastError` is forced to a string, not an object.
2015-05-28 11:49:46 +01:00
Paul Bellamy
637215fcff
add status of connection-maker to status-json
2015-05-28 11:49:46 +01:00
Paul Bellamy
d16395b8b9
weave status should include 'Direct Peers' set with 'weave connect'
2015-05-28 11:49:46 +01:00
Adam Harrison
e110a8ab9c
Fix erroneous use of nil value
2015-05-28 10:23:02 +01:00
Bryan Boreham
cb03d1d763
Merge pull request #772 from alexwlchan/master
...
Thanks!
2015-05-28 10:11:58 +01:00
Alex Chan
2a1150b74e
Minor spelling corrections in docs
2015-05-28 10:10:16 +01:00
Paul Bellamy