Vendor swarmkit in master

Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 12a4ed03178982fec44b75479c3e63a316503d90
Component: engine
This commit is contained in:
Aaron Lehmann
2016-10-20 11:26:04 -07:00
parent 56af301200
commit 0ce7aa426e
74 changed files with 2236 additions and 1049 deletions

View File

@ -26,8 +26,8 @@ import (
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/runconfig"
swarmagent "github.com/docker/swarmkit/agent"
swarmapi "github.com/docker/swarmkit/api"
swarmnode "github.com/docker/swarmkit/node"
"golang.org/x/net/context"
)
@ -123,7 +123,7 @@ type attacher struct {
}
type node struct {
*swarmagent.Node
*swarmnode.Node
done chan struct{}
ready bool
conn *grpc.ClientConn
@ -279,7 +279,7 @@ func (c *Cluster) startNewNode(forceNewCluster bool, localAddr, remoteAddr, list
c.node = nil
c.cancelDelay = nil
c.stop = false
n, err := swarmagent.NewNode(&swarmagent.NodeConfig{
n, err := swarmnode.New(&swarmnode.Config{
Hostname: c.config.Name,
ForceNewCluster: forceNewCluster,
ListenControlAPI: filepath.Join(c.runtimeRoot, controlSocket),