Merge pull request #2230 from mavenugo/exp-ipv
Moving IPVLAN driver out of experimental
This commit is contained in:
commit
8e7aead94f
2 changed files with 3 additions and 14 deletions
|
@ -1,9 +0,0 @@
|
|||
package libnetwork
|
||||
|
||||
import "github.com/docker/libnetwork/drivers/ipvlan"
|
||||
|
||||
func additionalDrivers() []initializer {
|
||||
return []initializer{
|
||||
{ipvlan.Init, "ipvlan"},
|
||||
}
|
||||
}
|
|
@ -3,6 +3,7 @@ package libnetwork
|
|||
import (
|
||||
"github.com/docker/libnetwork/drivers/bridge"
|
||||
"github.com/docker/libnetwork/drivers/host"
|
||||
"github.com/docker/libnetwork/drivers/ipvlan"
|
||||
"github.com/docker/libnetwork/drivers/macvlan"
|
||||
"github.com/docker/libnetwork/drivers/null"
|
||||
"github.com/docker/libnetwork/drivers/overlay"
|
||||
|
@ -13,14 +14,11 @@ func getInitializers(experimental bool) []initializer {
|
|||
in := []initializer{
|
||||
{bridge.Init, "bridge"},
|
||||
{host.Init, "host"},
|
||||
{ipvlan.Init, "ipvlan"},
|
||||
{macvlan.Init, "macvlan"},
|
||||
{null.Init, "null"},
|
||||
{remote.Init, "remote"},
|
||||
{overlay.Init, "overlay"},
|
||||
}
|
||||
|
||||
if experimental {
|
||||
in = append(in, additionalDrivers()...)
|
||||
{remote.Init, "remote"},
|
||||
}
|
||||
return in
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue