summaryrefslogtreecommitdiff
path: root/libnetwork/drivers_linux.go
diff options
context:
space:
mode:
authorMadhu Venugopal <madhu@docker.com>2016-03-02 17:13:15 -0800
committerBrent Salisbury <brent@docker.com>2016-03-09 19:43:20 -0500
commited9601e4c65554ab7e88a0d0dd3b8954cf0dbade (patch)
tree366bfe67f131e4b74578057e3c5ec7f5d563417c /libnetwork/drivers_linux.go
parentea301133039d9852455893a4ada1ab887ebe8459 (diff)
downloaddocker-ed9601e4c65554ab7e88a0d0dd3b8954cf0dbade.tar.gz
Make macvlan and ipvlan drivers as experimental
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Diffstat (limited to 'libnetwork/drivers_linux.go')
-rw-r--r--libnetwork/drivers_linux.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/libnetwork/drivers_linux.go b/libnetwork/drivers_linux.go
index 91964519b6..df8b4d734b 100644
--- a/libnetwork/drivers_linux.go
+++ b/libnetwork/drivers_linux.go
@@ -3,21 +3,20 @@ 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"
"github.com/docker/libnetwork/drivers/remote"
)
func getInitializers() []initializer {
- return []initializer{
+ in := []initializer{
{bridge.Init, "bridge"},
{host.Init, "host"},
{null.Init, "null"},
{remote.Init, "remote"},
{overlay.Init, "overlay"},
- {macvlan.Init, "macvlan"},
- {ipvlan.Init, "ipvlan"},
}
+
+ in = append(in, additionalDrivers()...)
+ return in
}