Fix conflicts with main branch

pageserver/src/repository/rocksdb.rs

@@ -376,7 +376,6 @@ impl RocksTimeline {
         Ok(0)
     }
 
-
     fn do_gc(&self, conf: &'static PageServerConf) -> Result<Bytes> {
         loop {
             thread::sleep(conf.gc_period);

pageserver/src/walreceiver.rs

@@ -196,7 +196,6 @@ fn walreceiver_main(
 
                 while let Some((lsn, recdata)) = waldecoder.poll_decode()? {
                     let old_checkpoint_bytes = encode_checkpoint(checkpoint);
-                    //info!("Decode WAL record at LSN {}", lsn);
                     let decoded = decode_wal_record(&mut checkpoint, recdata.clone());
                     timeline.save_decoded_record(decoded, recdata, lsn)?;
 

pageserver/src/walredo.rs

@@ -293,10 +293,6 @@ impl PostgresRedoManagerInternal {
                     let mut status = 0;
                     if info == pg_constants::XLOG_XACT_COMMIT {
                         status = pg_constants::TRANSACTION_STATUS_COMMITTED;
-                        info!(
-                            "Mark transaction {} as committed at LSN {}",
-                            xlogrec.xl_xid, lsn
-                        );
                         transaction_id_set_status(xlogrec.xl_xid, status, &mut page);
                         //handle subtrans
                         let _xact_time = buf.get_i64_le();