Merge pull request #7913 from gyuho/srv

pkg/srv: fix error checks from resolveTCPAddr

pkg/srv/srv.go

@@ -55,7 +55,7 @@ func GetCluster(service, name, dns string, apurls types.URLs) ([]string, error)
 			host := net.JoinHostPort(srv.Target, port)
 			tcpAddr, terr := resolveTCPAddr("tcp", host)
 			if terr != nil {
-				terr = err
+				err = terr
 				continue
 			}
 			n := ""