Bryan Boreham 43d8781fdd Merge remote-tracking branch 'upstream/master' into 11_http_interface ...

Conflicts:
	consts.go
	weaver/weave

2014-09-04 13:02:14 +01:00

..

.gitignore

eliminate dependency on pipework

2014-08-22 18:14:17 +01:00

docker-ns

rename exe to 'weaver' and script to 'weave'

2014-08-21 16:05:17 +01:00

Dockerfile

rename exe to 'weaver' and script to 'weave'

2014-08-21 16:05:17 +01:00

main.go

Merge remote-tracking branch 'upstream/master' into 11_http_interface

2014-09-04 13:02:14 +01:00

Makefile

eliminate dependency on pipework

2014-08-22 18:14:17 +01:00

weave

Merge remote-tracking branch 'upstream/master' into 11_http_interface

2014-09-04 13:02:14 +01:00