Merge branch 'master' into service_config_pr

2017-04-06 14:12:34 -07:00
parent 6f8b55318a 1d27587e10
commit fa2968617c
12 changed files with 82 additions and 102 deletions
--- a/call.go
+++ b/call.go
@ -262,7 +262,7 @@ func invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 		t, put, err = cc.getTransport(ctx, gopts)
 		if err != nil {
 			// TODO(zhaoq): Probably revisit the error handling.
-			if _, ok := err.(status.Status); ok {
+			if _, ok := status.FromError(err); ok {
 				return err
 			}
 			if err == errConnClosing || err == errConnUnavailable {