Merge branch 'master' into bucket-name-path

Author: igorcanadi

cloud/cloud_env_impl.h

@@ -28,7 +28,7 @@ class CloudEnvImpl : public CloudEnv {
   const LogType& GetLogType() const { return log_type_; }
 
   // Returns the underlying env
-  Env* GetBaseEnv() { return base_env_; }
+  Env* GetBaseEnv() override { return base_env_; }
 
   // The separator used to separate dbids while creating the dbid of a clone
   static constexpr const char* DBID_SEPARATOR = "rockset";

cloud/db_cloud_test.cc

@@ -12,6 +12,7 @@
 #include "rocksdb/cloud/db_cloud.h"
 #include <algorithm>
 #include <chrono>
+#include <inttypes.h>
 #include "cloud/aws/aws_env.h"
 #include "cloud/aws/aws_file.h"
 #include "cloud/db_cloud_impl.h"