Resolved merge conflicts

eBay · Jun 21, 2024 · d086b8f · d086b8f
1 parent ac81454
commit d086b8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.4.20"
+    version = "6.4.21"
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"
     topics = ("ebay", "nublox")

diff --git a/src/tests/test_common/homestore_test_common.hpp b/src/tests/test_common/homestore_test_common.hpp
@@ -239,9 +239,7 @@ class HSTestHelper {
                 for (const auto& name : devs) {
                     // TODO:: Add support for fast and data devices in device_list
                     token.devs_.emplace_back(name,
-                                             token.devs_.empty()
-                                                 ? homestore::HSDevType::Fast
-                                                 : homestore::HSDevType::Data); // First device is fast device
+                                             homestore::HSDevType::Data); // First device is fast device
                 }
             } else {
                 LOGINFO("Taking input dev_list: {}",