Bryan Boreham
f593c2fbf2
Change default IP allocation range from 10.128/10 to 10.32/12
2015-07-06 17:09:05 +01:00
Bryan Boreham
bd24307c2b
Merge pull request #1069 from 2opremio/fons/fix-tests-OSX
...
LGTM
2015-07-06 16:43:26 +01:00
Michael Bridgen
e0c7054f9b
Merge pull request #1075 from weaveworks/fons/test-vagrant-creation
...
Explain how to create the test VMs from vagrant
2015-07-06 16:31:22 +01:00
Michael Bridgen
59550e0fcb
Merge branch 'pr1077'
2015-07-06 16:27:45 +01:00
Michael Bridgen
af64c8e2af
Merge branch '1063_status_json_accept_header' of github.com:weaveworks/weave into pr1077
2015-07-06 16:25:58 +01:00
Matthias Radestock
03ac7a86c6
make bin/multiweave work again in 'launch launches everything' world
2015-07-06 15:13:21 +01:00
Matthias Radestock
80a232f44c
copy latest random_mac() from weave script to bin/multiweave
2015-07-06 15:09:23 +01:00
Matthias Radestock
cf7fff3da2
Merge pull request #1080 from weaveworks/1014-weave-env
...
rename proxy-(env|config) to (env|config)
Closes #1014 .
2015-07-06 15:04:40 +01:00
Alfonso Acosta
373d663b5e
Fix integration tests for OSX
2015-07-06 14:48:53 +01:00
Alfonso Acosta
e86d255a47
Add comment about running integration tests from the Vagrant build VM
2015-07-06 14:07:16 +01:00
Paul Bellamy
5c44f74475
rename proxy-(env|config) to (env|config)
...
Keep error message to stderr, as the proxy should be launched with
'weave launch'. 'proxy-(env|config)' are kept with a deprecation
warning, for a while.
2015-07-06 13:41:23 +01:00
Matthias Radestock
5c7763b075
Merge branch '1.0'
2015-07-06 11:00:15 +01:00
Matthias Radestock
e3ab396428
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-06 10:59:34 +01:00
Matthias Radestock
df31454c30
Merge commit 'c8032b6' into latest_release_doc_updates
2015-07-06 10:58:18 +01:00
Matthias Radestock
c8bd47e948
set correct content-type header when returning json status
2015-07-05 19:25:28 +01:00
Matthias Radestock
098fc81825
output json status based on 'Accept' header
...
...instead if having a separate URL.
Closes #1063 .
2015-07-05 19:19:02 +01:00
Alfonso Acosta
cab4a7e1ee
Explain how to create the test VMs from vagrant
2015-07-05 18:59:53 +01:00
Matthias Radestock
5559f1df2e
cosmetic: remove some unnecessary quoting
...
for consistency, since we don't quote the same term anywhere else
2015-07-04 18:14:13 +01:00
Matthias Radestock
156597a965
small simplifying refactor: use shortcircuit boolean expressions
2015-07-04 18:04:25 +01:00
Matthias Radestock
cf4fffa394
Merge pull request #1057 from weaveworks/329-log-level-choice
...
Give the user more choice of log levels
Closes #329
2015-07-04 03:46:59 +01:00
Matthias Radestock
b30de63f18
Merge pull request #1067 from paulbellamy/proxy-stderr
...
print all stderr output from callWeave to the proxy logs, even if successful
Closes #1056
2015-07-04 03:44:50 +01:00
Bryan Boreham
ff2d7451e2
Remove -debug option, superceded by --log-level
2015-07-04 03:27:07 +01:00
Matthias Radestock
910b57731d
remove stray -debug in tests
2015-07-04 03:19:27 +01:00
Matthias Radestock
b8aa1d473b
remove dead code
2015-07-04 02:53:36 +01:00
Matthias Radestock
ce26f88ee2
Merge branch '1.0'
...
Conflicts:
router/crypto.go
router/ethernet_decoder.go
router/handshake_test.go
router/mocks_test.go
router/peers_test.go
router/router.go
router/udp_sender.go
2015-07-03 20:47:29 +01:00
Matthias Radestock
bf73029d15
cosmetic: goimports -w .
2015-07-03 20:41:35 +01:00
Matthias Radestock
4dbd657a26
import gopacket from github instaead of google code
...
The latter redirects to the former, which breaks `go get`.
Closes #1071 .
2015-07-03 20:32:27 +01:00
Matthias Radestock
1524796408
Merge pull request #1068 from weaveworks/1004-seed-random
...
Seed random-number generator from the host time
Fixes #1004 .
2015-07-03 16:01:16 +01:00
Paul Bellamy
7821412bf7
[proxy] print all stderr from callWeave to the proxy logs, even if successful
2015-07-03 15:45:09 +01:00
Matthias Radestock
b72b7a9ed5
Merge branch '1.0'
2015-07-03 14:28:42 +01:00
Matthias Radestock
a3a7a19870
simplifying refactor
2015-07-03 14:28:18 +01:00
Matthias Radestock
8b0089565f
Merge branch '1.0'
2015-07-03 14:18:46 +01:00
Matthias Radestock
251c68e85a
Merge pull request #1064 from weaveworks/issues/1023-await-ipam-forever
...
Wait forever for IPAM
Fixes #1023 .
2015-07-03 14:17:52 +01:00
Adam Harrison
227cb11f25
Router, DNS and proxy wait forever by default
2015-07-03 14:01:34 +01:00
Adam Harrison
6097dc8aaa
Add wait forever capability to EnsureInterface
2015-07-03 14:01:34 +01:00
Bryan Boreham
8c6c692926
Seed the math/rand generator from the time
2015-07-03 13:39:47 +01:00
Matthias Radestock
b81fce32f6
one more s/proxy/Weave Docker API proxy
2015-07-03 11:51:12 +01:00
Matthias Radestock
3ea1448c52
cosmetic
2015-07-03 11:49:20 +01:00
Matthias Radestock
f31a3c1261
Merge branch '1.0'
2015-07-03 11:48:07 +01:00
Matthias Radestock
9e32605183
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 11:45:37 +01:00
Matthias Radestock
9009e0eb7f
one more s/proxy/Weave Docker API proxy
2015-07-03 11:45:05 +01:00
Matthias Radestock
243d445d1b
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:59:10 +01:00
Matthias Radestock
65cd2b0e04
missed one
2015-07-03 10:58:22 +01:00
Matthias Radestock
33b230c114
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:56:00 +01:00
Matthias Radestock
6389af6ea2
Merge pull request #1066 from weaveworks/1019_rename_proxy_in_docs
...
introduce 'Proxy' as 'Docker API Proxy'
Closes #1066 .
2015-07-03 10:55:17 +01:00
Matthias Radestock
fcea6fcbf8
Merge branch '1.0'
2015-07-03 10:03:43 +01:00
Matthias Radestock
8b35f5e8fe
fix typo in comment
2015-07-03 10:03:07 +01:00
Matthias Radestock
7d5dcfafc9
introduce 'Proxy' as 'Docker API Proxy'
...
in order to reduce potential confusion about its role.
Closes #1019 .
2015-07-03 03:33:23 +01:00
Matthias Radestock
07ee2df822
cosmetic(ish): use dotted import. like everywhere else
2015-07-02 21:07:51 +01:00
Paul Bellamy
5b79e274e8
fixup logging changes, so it compiles
2015-07-02 17:04:21 +01:00
Bryan Boreham