From b3222a8f117475591a5d6bcac9ea2cd42a6b962e Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 20 May 2015 12:53:02 -0700 Subject: [PATCH] rename Destroy ro RemoveContainer for consistency Signed-off-by: Victor Vieux --- cluster/engine.go | 4 ++-- cluster/swarm/cluster.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/engine.go b/cluster/engine.go index 68633bc1a6..419c75c0c2 100644 --- a/cluster/engine.go +++ b/cluster/engine.go @@ -400,8 +400,8 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (* return e.containers[id], nil } -// Destroy and remove a container from the engine. -func (e *Engine) Destroy(container *Container, force bool) error { +// RemoveContainer a container from the engine. +func (e *Engine) RemoveContainer(container *Container, force bool) error { if err := e.client.RemoveContainer(container.Id, force, true); err != nil { return err } diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index 21f0a7fd7f..3a2a85ebe5 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -149,7 +149,7 @@ func (c *Cluster) RemoveContainer(container *cluster.Container, force bool) erro c.scheduler.Lock() defer c.scheduler.Unlock() - if err := container.Engine.Destroy(container, force); err != nil { + if err := container.Engine.RemoveContainer(container, force); err != nil { return err }