1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #26881 from miaoyq/del-redundant-func

The function "errClusterNetworkOnRun" is't used in the project
This commit is contained in:
Sebastiaan van Stijn 2016-09-25 19:51:16 +02:00 committed by GitHub
commit 8eadd439c6

View file

@ -330,10 +330,6 @@ func (daemon *Daemon) updateNetwork(container *container.Container) error {
return nil return nil
} }
func errClusterNetworkOnRun(n string) error {
return fmt.Errorf("swarm-scoped network (%s) is not compatible with `docker create` or `docker run`. This network can only be used by a docker service", n)
}
func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (libnetwork.Network, *networktypes.NetworkingConfig, error) { func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (libnetwork.Network, *networktypes.NetworkingConfig, error) {
n, err := daemon.FindNetwork(idOrName) n, err := daemon.FindNetwork(idOrName)
if err != nil { if err != nil {