Merge branch '1.8'

This commit is contained in:
Bryan Boreham committed 2016-12-08 12:27:40 +00:00
commit bb1cca713d
6 files changed
+117 -8

No files matched your search

+6
View File
@@ -226,6 +226,12 @@ func main() {
overlay, bridge := createOverlay(datapathName, ifaceName, isAWSVPC, config.Host, config.Port, bufSzMB)
networkConfig.Bridge = bridge
if bridge != nil {
if err := weavenet.DetectHairpin("vethwe-bridge", Log); err != nil {
Log.Errorf("DetectHairpin failed: %s", err)
}
}
name := peerName(routerName, bridge.Interface())
if nickName == "" {