From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 18 Nov 2022 20:53:52 +0000 (-0500)
Subject: cmake: replace WITH_CPP_REDIS with WITH_RADOSGW_D4N_FILTER
X-Git-Tag: v19.0.0~1055^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb473e6d440ef8f06a9fc8034183c7402ba20213;p=ceph.git

cmake: replace WITH_CPP_REDIS with WITH_RADOSGW_D4N_FILTER

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20219c7ac5e3..25af73a28aea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -296,7 +296,6 @@ if(WITH_CEPHFS_JAVA)
 endif()
 
 if(WITH_RADOSGW_D4N)
->>>>>>> f409ee2d871 (RGW: Update D4N files and cpp_redis submodule)
   add_subdirectory(cpp_redis)
 endif()