Fix merge issue

Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb Component: engine
2013-05-24 11:56:21 -07:00
parent db38840f84
commit d66839e06f
2 changed files with 1 additions and 2 deletions
@@ -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)
 }
@@ -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])