Merge branch '1.2'

This commit is contained in:
Adam Harrison committed 2015-11-02 17:28:31 +00:00
commit 7e1b7a2fcd
2 files changed
+44 -8

No files matched your search

+6 -3
View File
@@ -13,7 +13,6 @@ import (
"github.com/davecheney/profile"
"github.com/docker/docker/pkg/mflag"
"github.com/gorilla/mux"
"github.com/weaveworks/go-odp/odp"
. "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/common/docker"
@@ -119,8 +118,12 @@ func main() {
os.Exit(0)
case createDatapath:
err := weave.CreateDatapath(datapathName)
if odp.IsKernelLacksODPError(err) {
err, odp_supported := weave.CreateDatapath(datapathName)
if !odp_supported {
if err != nil {
Log.Error(err)
}
// When the kernel lacks ODP support, exit
// with a special status to distinguish it for
// the weave script.