Merge remote-tracking branch 'origin/v3' into v3
# Conflicts: # client/noop.go # errors/errors_test.go # logger/unwrap/unwrap_test.go # register/memory/memory_test.go # server/noop_test.go # service.go # util/dns/cache.go # util/dns/conn.go # util/structfs/metadata_ec2.go # util/time/duration.go
This commit is contained in:
		| @@ -171,7 +171,6 @@ type rpcMessage struct { | ||||
| 	header      metadata.Metadata | ||||
| 	topic       string | ||||
| 	contentType string | ||||
| 	body        []byte | ||||
| } | ||||
|  | ||||
| func (r *rpcMessage) ContentType() string { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user