kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Moving MacVlan driver out of experimental 

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2016-06-13 19:38:18 -07:00
parent bbba96fcc5
commit fe56a8d3dc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnetwork/drivers_experimental_linux.go
View File

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

2
libnetwork/drivers_linux.go
View File

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