fix rebase issue

cmd/influx/cli/cli_test.go

@@ -194,7 +194,7 @@ func TestParseCommand_Connect(t *testing.T) {
 
 	// assert connection is established
 	if err := c.ParseCommand(cmd); err != nil {
-		t.Fatalf("There was an error while connecting to %s: %s", u.Path, err)
+		t.Fatalf("There was an error while connecting to %v: %v", u.Path, err)
 	}
 
 	// assert server version is populated

cmd/influxd/run/server.go

@@ -432,7 +432,6 @@ func (s *Server) Open() error {
 		}
 
 		s.Subscriber.MetaClient = s.MetaClient
-		s.ShardMapper.MetaClient = s.MetaClient
 		s.QueryExecutor.MetaClient = s.MetaClient
 		s.ShardWriter.MetaClient = s.MetaClient
 		s.HintedHandoff.MetaClient = s.MetaClient