Merge branch '1.4'

Browse Source

(but really replace all the changes, which were in 'mesh', with
vendoring the latest mesh)

...

This commit is contained in:

Matthias Radestock committed 2016-03-23 16:30:28 +00:00

2 parents c75cadf007 8360024e06

commit 4dcec8265d

1 file changed

+1 -1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

vendor/github.com/weaveworks/mesh

Generated Vendored

+1 -1

Submodule vendor/github.com/weaveworks/mesh updated: fca6b1feb0...f51319a38f.