Rebasing

Author: annahay4

rust-runtime/aws-smithy-runtime/src/client/retries/token_bucket.rs

@@ -13,16 +13,12 @@ use tokio::sync::{OwnedSemaphorePermit, Semaphore};
 use tracing::trace;
 
 const DEFAULT_CAPACITY: usize = 500;
-<<<<<<< HEAD
-const MAXIMUM_CAPACITY: usize = 1_000_000;
-=======
 // On a 32 bit architecture, the value of Semaphore::MAX_PERMITS is 536,870,911.
 // Therefore, we will enforce a value lower than that to ensure behavior is
 // identical across platforms.
 // This also allows room for slight bucket overfill in the case where a bucket
 // is at maximum capacity and another thread drops a permit it was holding.
 const MAXIMUM_CAPACITY: usize = 500_000_000;
->>>>>>> fdf7e2a42 (Moving max capacity for semaphore below max value on 32 bit system)
 const DEFAULT_RETRY_COST: u32 = 5;
 const DEFAULT_RETRY_TIMEOUT_COST: u32 = DEFAULT_RETRY_COST * 2;
 const PERMIT_REGENERATION_AMOUNT: usize = 1;