Skip to content

Commit 8be2d07

Browse files
author
Flavio Crisciani
authored
Merge pull request #2230 from mavenugo/exp-ipv
Moving IPVLAN driver out of experimental
2 parents 04a014d + 388a43b commit 8be2d07

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

drivers_experimental_linux.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

drivers_linux.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package libnetwork
33
import (
44
"github.com/docker/libnetwork/drivers/bridge"
55
"github.com/docker/libnetwork/drivers/host"
6+
"github.com/docker/libnetwork/drivers/ipvlan"
67
"github.com/docker/libnetwork/drivers/macvlan"
78
"github.com/docker/libnetwork/drivers/null"
89
"github.com/docker/libnetwork/drivers/overlay"
@@ -13,14 +14,11 @@ func getInitializers(experimental bool) []initializer {
1314
in := []initializer{
1415
{bridge.Init, "bridge"},
1516
{host.Init, "host"},
17+
{ipvlan.Init, "ipvlan"},
1618
{macvlan.Init, "macvlan"},
1719
{null.Init, "null"},
18-
{remote.Init, "remote"},
1920
{overlay.Init, "overlay"},
20-
}
21-
22-
if experimental {
23-
in = append(in, additionalDrivers()...)
21+
{remote.Init, "remote"},
2422
}
2523
return in
2624
}

0 commit comments

Comments
 (0)