Matthias Radestock
21ee0fdcf7
Merge branch '0.11'
2015-05-31 11:54:54 +01:00
Matthias Radestock
158fb36c8c
Merge remote-tracking branch 'upstream/0.11' into 0.11
2015-05-31 11:54:08 +01:00
Matthias Radestock
5f385a297c
remove bashism
...
This was introduced in #780 .
2015-05-31 11:51:34 +01:00
Matthias Radestock
8d0adb9359
refactor(ish): use full container id when we have it
2015-05-31 11:25:13 +01:00
Matthias Radestock
79eb4c298c
refactor: extract helper for and simplify get_ipam_cidr
2015-05-31 09:59:32 +01:00
Matthias Radestock
6f57bcb477
tiny refactor - use full container id, since we happen to have it
2015-05-31 09:35:53 +01:00
Matthias Radestock
54dbc2f582
cosmetic
2015-05-31 09:03:45 +01:00
Matthias Radestock
1a8f2117b1
explain Direct Peers status
2015-05-29 17:35:21 +01:00
Matthias Radestock
59fd53ee99
Merge pull request #800 from paulbellamy/proxy-status
...
Add proxy info to 'weave status' output
Closes #756 .
2015-05-29 17:13:33 +01:00
Matthias Radestock
8c27d469a1
add Direct Peers to status output example
...
This was missed in #764 .
2015-05-29 17:05:34 +01:00
Paul Bellamy
7f62ba6ebe
Add proxy info to './weave status' output
2015-05-29 17:05:25 +01:00
Matthias Radestock
9a1e8c07ac
cosmetic: report direct peers on one line in status
2015-05-29 17:03:33 +01:00
Matthias Radestock
b7df116491
make weave reset stop the proxy
...
Missed this in #790 .
2015-05-29 16:43:18 +01:00
Paul Bellamy
ece1fa1b1b
Merge remote-tracking branch 'upstream/0.11'
2015-05-29 16:35:59 +01:00
Matthias Radestock
1769cdad7c
Merge pull request #799 from paulbellamy/proxy-attach
...
Proxy kills container and returns error when attach fails
Fixes #788 .
2015-05-29 16:35:25 +01:00
Matthias Radestock
99b1e00a75
Merge pull request #794 from paulbellamy/connect-replace
...
add 'weave connect --replace ...'
Closes #658 .
2015-05-29 15:52:32 +01:00
Matthias Radestock
e0f4da4641
Merge pull request #792 from rade/720_auto_assigned_dns_http_test_port
...
use an automatically assigned port for http tests
Fixes #720 .
2015-05-29 15:51:38 +01:00
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
Paul Bellamy
858356de22
add 'weave connect --replace ...'
2015-05-29 15:44:45 +01:00
Paul Bellamy
4f73ef73bb
weavewait should exit if it times out
...
To match behaviour of proxy when interface fails to attach
2015-05-29 14:37:58 +01:00
Paul Bellamy
0cb2e80e09
Proxy kills container and returns error when attach fails
2015-05-29 14:37:33 +01:00
Matthias Radestock
08a17ec376
no need for sleeps to wait for http server
...
Since we start the tcp listener in the main thread now, connections
can be made immediately; they will just queue up until there is a
handler.
2015-05-29 14:17:03 +01:00
Matthias Radestock
3ad08c0f2a
don't print the test port
...
it's of no interest whatsoever
2015-05-29 14:05:24 +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
Matthias Radestock
fb721558af
auto-assign port in ipam tests
2015-05-29 12:35:23 +01: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
Matthias Radestock
c93e789b6b
use an automatically assigned port for http tests
...
instead of random port, which can clash
Fixes #720 .
2015-05-29 10:21:41 +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