Merge branch 'master' into adjust-raft-service-stop

vesoft-inc · Nov 26, 2021 · 64d8d0b · 64d8d0b
2 parents 63219e6 + 53c3c2f
commit 64d8d0b
Show file tree

Hide file tree

Showing 62 changed files with 494 additions and 653 deletions.
diff --git a/src/clients/storage/CMakeLists.txt b/src/clients/storage/CMakeLists.txt
@@ -3,14 +3,8 @@
 # This source code is licensed under Apache 2.0 License.
 
 nebula_add_library(
-    graph_storage_client_obj OBJECT
-    GraphStorageClient.cpp
-)
-
-
-nebula_add_library(
-    general_storage_client_obj OBJECT
-    GeneralStorageClient.cpp
+    storage_client_obj OBJECT
+    StorageClient.cpp
 )
 
 

diff --git a/src/clients/storage/GeneralStorageClient.cpp b/src/clients/storage/GeneralStorageClient.cpp
diff --git a/src/clients/storage/GeneralStorageClient.h b/src/clients/storage/GeneralStorageClient.h