Fix rebase issues

Author: ypatia

tiledb/sm/consolidator/consolidator.cc

@@ -213,9 +213,8 @@ void Consolidator::fragments_consolidate(
   }
 
   if (array_uri.is_tiledb()) {
-    throw_if_not_ok(
-        storage_manager->resources().rest_client()->post_consolidation_to_rest(
-            array_uri, config, &fragment_uris));
+    throw_if_not_ok(resources.rest_client()->post_consolidation_to_rest(
+        array_uri, config, &fragment_uris));
   } else {
     // Check if array exists
     if (object_type(resources, array_uri) != ObjectType::ARRAY) {

tiledb/sm/rest/rest_client.h

@@ -466,7 +466,8 @@ class RestClient {
   }
 
   /// Operation disabled in base class.
-  inline virtual Status post_consolidation_to_rest(const URI&, const Config&, const std::vector<std::string>*) {
+  inline virtual Status post_consolidation_to_rest(
+      const URI&, const Config&, const std::vector<std::string>* = nullptr) {
     throw RestClientDisabledException();
   }
 

tiledb/sm/rest/rest_client_remote.cc

@@ -1531,7 +1531,7 @@ Status RestClientRemote::ensure_json_null_delimited_string(Buffer* buffer) {
   return Status::Ok();
 }
 
-Status RestClient::post_consolidation_to_rest(
+Status RestClientRemote::post_consolidation_to_rest(
     const URI& uri,
     const Config& config,
     const std::vector<std::string>* fragment_uris) {