summaryrefslogtreecommitdiff
path: root/builtins/builtins.go
diff options
context:
space:
mode:
authorunclejack <unclejack@users.noreply.github.com>2014-04-09 01:56:01 +0300
committerunclejack <unclejack@users.noreply.github.com>2014-04-09 01:56:01 +0300
commite128a606e39fa63c6b4fd6e53a1d88cf00aad868 (patch)
tree199ee7eb6678ffecd2ddad95fce794c795ad5183 /builtins/builtins.go
parent143c9707a9fafc39e1d9747f528db97b2564f01e (diff)
parentdc9c28f51d669d6b09e81c2381f800f1a33bb659 (diff)
downloaddocker-release-0.10.tar.gz
Merge pull request #5079 from unclejack/bump_v0.10.0release-0.100.10.1-hotfixes
Bump version to v0.10.0
Diffstat (limited to 'builtins/builtins.go')
-rw-r--r--builtins/builtins.go12
1 files changed, 5 insertions, 7 deletions
diff --git a/builtins/builtins.go b/builtins/builtins.go
index 5b146cd20f..109bc5b913 100644
--- a/builtins/builtins.go
+++ b/builtins/builtins.go
@@ -1,11 +1,10 @@
package builtins
import (
+ api "github.com/dotcloud/docker/api/server"
"github.com/dotcloud/docker/engine"
-
- "github.com/dotcloud/docker"
- "github.com/dotcloud/docker/api"
- "github.com/dotcloud/docker/networkdriver/lxc"
+ "github.com/dotcloud/docker/runtime/networkdriver/bridge"
+ "github.com/dotcloud/docker/server"
)
func Register(eng *engine.Engine) {
@@ -34,7 +33,6 @@ func remote(eng *engine.Engine) {
// These components should be broken off into plugins of their own.
//
func daemon(eng *engine.Engine) {
- eng.Register("initserver", docker.InitServer)
- eng.Register("init_networkdriver", lxc.InitDriver)
- eng.Register("version", docker.GetVersion)
+ eng.Register("initserver", server.InitServer)
+ eng.Register("init_networkdriver", bridge.InitDriver)
}