0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #616 from mavenugo/vin-fixes

Browse source 
Fixed a couple of error messages to address UX related comments
This commit is contained in:
Jana Radhakrishnan 2015-10-09 02:12:50 -07:00
commit 9b843d6c04
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/endpoint.go
View file

@ -286,7 +286,7 @@ func (ep *endpoint) sbJoin(sbox Sandbox, options ...EndpointOption) error {
ep.Lock() ep.Lock()
if ep.sandboxID != "" { if ep.sandboxID != "" {
ep.Unlock() ep.Unlock()
return types.ForbiddenErrorf("a sandbox has already joined the endpoint") return types.ForbiddenErrorf("another container is attached to the same network endpoint")
} }
ep.Unlock() ep.Unlock()

2
libnetwork/error.go
View file

@ -129,7 +129,7 @@ type ActiveEndpointsError struct {
} }
func (aee *ActiveEndpointsError) Error() string { func (aee *ActiveEndpointsError) Error() string {
return fmt.Sprintf("network with name %s id %s has active endpoints", aee.name, aee.id) return fmt.Sprintf("network %s has active endpoints", aee.name)
} }
// Forbidden denotes the type of this error // Forbidden denotes the type of this error