From d086b8f537fad0bab4b00e3334ed8c0b0d6a9584 Mon Sep 17 00:00:00 2001 From: Harihara Kadayam Date: Mon, 10 Jun 2024 14:04:37 -0700 Subject: [PATCH] Resolved merge conflicts --- conanfile.py | 2 +- src/tests/test_common/homestore_test_common.hpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6787c8b9c..f9a137fec 100644 --- 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 index acf447e76..f7f759506 100644 --- 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: {}",