Merge branch '1.6'

This commit is contained in:
Matthias Radestock committed 2016-09-08 12:55:05 +01:00
commit 06a63db4cf
3 files changed
+30 -17

No files matched your search

+2 -1
View File
@@ -1773,7 +1773,8 @@ launch_plugin_if_not_running() {
return 1
fi
wait_for_status $PLUGIN_CONTAINER_NAME http_call_unix $PLUGIN_CONTAINER_NAME status.sock
util_op create-plugin-network weave weavemesh
WEAVE_IPAM_SUBNET=$(call_weave GET /ipinfo/defaultsubnet)
util_op create-plugin-network weave weavemesh $WEAVE_IPAM_SUBNET
}
plugin_disabled() {