Bryan Boreham
08f6dcf08d
Missing format
2015-10-19 15:47:44 +00:00
Bryan Boreham
284d78c6b2
Update fetch_router_args in line with changes elsewhere
2015-10-19 15:47:44 +00:00
Bryan Boreham
b8b5fb9eae
Review feedback
2015-10-19 15:47:43 +00:00
Bryan Boreham
697ee62d9a
Use entrypoint to detect weave router
2015-10-19 15:47:43 +00:00
Bryan Boreham
20ac0edda8
Try a bigger sleep to get Docker restarted
2015-10-19 15:46:48 +00:00
Bryan Boreham
a1bbb06e2f
Don't need depreciation warnings on internal-only command
2015-10-19 15:46:47 +00:00
Bryan Boreham
a87cc5c3b1
Get the proxy to re-attach the weave router if it sees it restart
2015-10-19 15:46:47 +00:00
Matthias Radestock
5ff740cddc
cosmetic
2015-10-19 15:43:49 +01:00
Matthias Radestock
db9229f485
Merge pull request #1551 from weaveworks/1547-proxy-restart-no-kill-containers
...
Proxy restart shouldn't kill containers
Fixes #1547 .
2015-10-19 13:55:48 +01:00
Paul Bellamy
ace6c01b00
Review feedback
2015-10-19 13:53:20 +01:00
Bryan Boreham
2f4d460c04
Merge pull request #1517 from weaveworks/1385-non-container-dns-add
...
LGTM. Fixes #1385
2015-10-19 12:52:09 +01:00
Matthias Radestock
d5401ae3cb
Merge pull request #1550 from dpw/weave2-eexist
...
Don't fail in launch-router if weave2 already exists
Fixes #1548 .
2015-10-16 21:36:45 +01:00
David Wragg
3482a7f1f1
Don't fail in launch-router if weave2 already exists
...
And delete weave2 on stop-router.
2015-10-16 20:59:06 +01:00
David Wragg
23762e0639
Move repeated 'stop' code into functions
2015-10-16 20:55:44 +01:00
Bryan Boreham
50cc15af3b
Merge pull request #1477 from weaveworks/weave-1374
...
LGTM. Fixes #1374
2015-10-16 18:02:16 +01:00
Paul Bellamy
a0f0367e60
[proxy] don't kill containers when starting the proxy
2015-10-16 15:33:43 +01:00
Adam Harrison
3f08ddefe9
Correct DisplayName implementation
2015-10-16 12:24:38 +01:00
Adam Harrison
debe656f9f
Merge pull request #1522 from dpw/fdp-compat
...
Fast datapath compatibility with 1.1
2015-10-16 11:26:20 +01:00
Alvaro Saurin
4350b6402f
Updated docs
2015-10-16 11:47:07 +02:00
Alvaro Saurin
5d2892f6fc
Test we respect --add-host when rewriting /etc/hosts
...
Simplify some tests
2015-10-16 11:47:07 +02:00
Alvaro Saurin
91f27ddd66
Removed weavehosts
2015-10-16 11:47:07 +02:00
Alvaro Saurin
6a674d0d67
Add hosts when attaching
2015-10-16 11:47:07 +02:00
Alvaro Saurin
0d165487b8
Rewrite /etc/hosts in the containers
2015-10-16 11:47:07 +02:00
Matthias Radestock
bacc5836ea
log listeners
2015-10-16 09:34:20 +01:00
Matthias Radestock
230931a2c9
prevent accidental var shadowing
...
Fixes #1544
2015-10-16 01:05:04 +01:00
Matthias Radestock
61d289f414
Merge branch '1.1'
2015-10-15 18:14:20 +01:00
Matthias Radestock
44255862a9
prevent spurious errors from showing up
...
silly mistake
2015-10-15 18:12:56 +01:00
Matthias Radestock
ed9577150b
suppress spurious errors
2015-10-15 18:01:06 +01:00
Matthias Radestock
80319e7087
Merge branch '1.1'
2015-10-15 17:41:49 +01:00
Matthias Radestock
379048d8fc
make test/setup.sh work under go 1.5
...
Fixes #1543 .
2015-10-15 17:40:51 +01:00
Matthias Radestock
9ac655d774
Merge pull request #1526 from weaveworks/fdp-docs
...
Document fast data path feature
Fixes #1526 .
2015-10-15 17:29:29 +01:00
Adam Harrison
9b17470129
Document fast data path feature
2015-10-15 17:19:13 +01:00
Matthias Radestock
5c114fc6fe
Merge pull request #1536 from weaveworks/1515-print-json
...
Print request and response json when debugging weaveproxy
Fixes #1515
2015-10-15 15:59:35 +01:00
Bryan Boreham
efb12f41b2
Also print intercepted responses
2015-10-15 15:07:02 +01:00
Adam Harrison
813edcfe0a
Merge branch '1.1'
2015-10-15 14:59:29 +01:00
Adam Harrison
dea1405d71
Remove hardcoded docker bridge IP from proxy test
2015-10-15 14:39:56 +01:00
Ilya Dmitrichenko
e7f91b7529
Update screencast preview image
2015-10-15 14:26:39 +01:00
Matthias Radestock
5e8a64508e
Merge remote-tracking branch 'upstream/master'
2015-10-15 14:19:50 +01:00
Matthias Radestock
21ebb7a585
Merge branch '1.1'
...
Conflicts:
Makefile
2015-10-15 14:19:14 +01:00
David Wragg
6edd430538
Use consistent options for all "go get"/"go build" invocations
...
Without this, building with go-1.5 fails with
go get ./prog/weavewait
go install net: open /usr/local/go/pkg/linux_amd64/net.a: permission denied
This makes the options passed too "go get"/"go build" consistent for
all executables. So it should be safe with go-1.4.
Conflicts:
Makefile
2015-10-15 14:16:33 +01:00
Ilya Dmitrichenko
34606e0f9f
Link to the new screencast ( close #1402 )
2015-10-15 14:07:54 +01:00
Matthias Radestock
5f62f9edc7
Merge branch '1.1'
2015-10-15 13:05:35 +01:00
Matthias Radestock
0d2ff55c07
Merge pull request #1535 from weaveworks/1523-rewrite-inspect-failure
...
[proxy] only attempt to rewrite successful inspects
Fixes #1523 .
2015-10-15 13:04:34 +01:00
Matthias Radestock
207ee8667b
Merge pull request #1538 from dpw/detect-no-fastdp-mismatch
...
signal mismatches between WEAVE_NO_FASTDP and the bridge type
Fixes #1533 .
2015-10-14 17:17:35 +01:00
David Wragg
5984ed921e
signal mismatches between WEAVE_NO_FASTDP and the bridge type
2015-10-14 16:33:23 +01:00
Matthias Radestock
aac5fb8c24
Merge pull request #1537 from weaveworks/1502-flakey-test
...
Wait until container exits in test to remove race condition
Fixes #1502
2015-10-14 16:19:20 +01:00
Matthias Radestock
8cfc8b3132
Merge pull request #1528 from weaveworks/weave-env-bug
...
[proxy] Fix bug in weave env/config when passing multiple -H flags
Fixes #1527
2015-10-14 15:50:42 +01:00
Paul Bellamy
0b5ebd7b1d
Wait until container exits in test to remove race condition
2015-10-14 14:53:23 +01:00
David Wragg
35141a4aef
Forward a packet with sleeve if the source or dest peer lacks a short ID
2015-10-14 13:53:59 +01:00
David Wragg
e702234fdc
Don't use a nil FlowOp to mean "discard the packet"
2015-10-14 13:53:34 +01:00
Bryan Boreham