1. docker
  2. Commit fe56a8d3dc7fa739830cac3035dcf134e77413c6
Browse code

Moving MacVlan driver out of experimental

Signed-off-by: Madhu Venugopal <madhu@docker.com>

Madhu Venugopal authored on 2016/06/14 11:38:18
Showing 2 changed files
libnetwork/drivers_experimental_linux.go
History View file @ fe56a8d
... ... 
@@ -2,14 +2,10 @@
2 2
3 3 
 package libnetwork
4 4
5 
-import (
6 
-	"github.com/docker/libnetwork/drivers/ipvlan"
7 
-	"github.com/docker/libnetwork/drivers/macvlan"
8 
-)
5 
+import "github.com/docker/libnetwork/drivers/ipvlan"
9 6
10 7 
 func additionalDrivers() []initializer {
11 8 
 	return []initializer{
12 
-		{macvlan.Init, "macvlan"},
13 9 
 		{ipvlan.Init, "ipvlan"},
14 10 
 	}
15 11 
 }
libnetwork/drivers_linux.go
History View file @ fe56a8d
... ... 
@@ -3,6 +3,7 @@ package libnetwork
3 3 
 import (
4 4 
 	"github.com/docker/libnetwork/drivers/bridge"
5 5 
 	"github.com/docker/libnetwork/drivers/host"
6 
+	"github.com/docker/libnetwork/drivers/macvlan"
6 7 
 	"github.com/docker/libnetwork/drivers/null"
7 8 
 	"github.com/docker/libnetwork/drivers/overlay"
8 9 
 	"github.com/docker/libnetwork/drivers/remote"
... ... 
@@ -12,6 +13,7 @@ func getInitializers() []initializer {
12 12 
 	in := []initializer{
13 13 
 		{bridge.Init, "bridge"},
14 14 
 		{host.Init, "host"},
15 
+		{macvlan.Init, "macvlan"},
15 16 
 		{null.Init, "null"},
16 17 
 		{remote.Init, "remote"},
17 18 
 		{overlay.Init, "overlay"},