Explorar o código

Moving MacVlan driver out of experimental

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Madhu Venugopal %!s(int64=9) %!d(string=hai) anos
pai
achega
fe56a8d3dc
Modificáronse 2 ficheiros con 3 adicións e 5 borrados
  1. 1 5
      libnetwork/drivers_experimental_linux.go
  2. 2 0
      libnetwork/drivers_linux.go

+ 1 - 5
libnetwork/drivers_experimental_linux.go

@@ -2,14 +2,10 @@
 
 package libnetwork
 
-import (
-	"github.com/docker/libnetwork/drivers/ipvlan"
-	"github.com/docker/libnetwork/drivers/macvlan"
-)
+import "github.com/docker/libnetwork/drivers/ipvlan"
 
 func additionalDrivers() []initializer {
 	return []initializer{
-		{macvlan.Init, "macvlan"},
 		{ipvlan.Init, "ipvlan"},
 	}
 }

+ 2 - 0
libnetwork/drivers_linux.go

@@ -3,6 +3,7 @@ package libnetwork
 import (
 	"github.com/docker/libnetwork/drivers/bridge"
 	"github.com/docker/libnetwork/drivers/host"
+	"github.com/docker/libnetwork/drivers/macvlan"
 	"github.com/docker/libnetwork/drivers/null"
 	"github.com/docker/libnetwork/drivers/overlay"
 	"github.com/docker/libnetwork/drivers/remote"
@@ -12,6 +13,7 @@ func getInitializers() []initializer {
 	in := []initializer{
 		{bridge.Init, "bridge"},
 		{host.Init, "host"},
+		{macvlan.Init, "macvlan"},
 		{null.Init, "null"},
 		{remote.Init, "remote"},
 		{overlay.Init, "overlay"},