From a3293ed854675074d7f5d5c2bca63ba9fa599deb Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 24 May 2013 11:56:21 -0700 Subject: [PATCH] Fix merge issue --- api.go | 1 - commands.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api.go b/api.go index 216ae027ee..a99828e961 100644 --- a/api.go +++ b/api.go @@ -662,6 +662,5 @@ func ListenAndServe(addr string, srv *Server, logging bool) error { r.Path(localRoute).Methods(localMethod).HandlerFunc(f) } } - return http.ListenAndServe(addr, r) } diff --git a/commands.go b/commands.go index 1c83e30454..8622225138 100644 --- a/commands.go +++ b/commands.go @@ -36,7 +36,7 @@ func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) { } func ParseCommands(addr string, port int, args ...string) error { - cli := NewDockerCli("0.0.0.0", 4243) + cli := NewDockerCli(addr, port) if len(args) > 0 { method, exists := cli.getMethod(args[0])