Fix merge conflicts

This commit is contained in:
Jingyu Zhou 2023-02-23 16:04:37 -08:00
parent 0b2e02c402
commit 82bd5796f5
1 changed files with 0 additions and 3 deletions

View File

@ -365,9 +365,6 @@ CommandFactory configureFactory(
"support for the "
"database. The configuration can be updated ONLY at the time of database creation and once set can't be "
"updated for the lifetime of the database.\n\n"
"exclude=<ADDRESS...>: Sets the addresses in the format of IP:port pair to be excluded during recruitment. "
"Note this should be only used the database is unavailable because of the faulty processes that are blocking "
"the recovery from completion. The number of addresses should be less than the replica factor.\n\n"
"exclude=<ADDRESS...>: Sets the addresses in the format of IP1:port1,IP2:port2 pairs to be excluded during "
"recruitment. Note this should be only used when the database is unavailable because of the faulty processes "
"that are blocking the recovery from completion. The number of addresses should be less than the replication "