Skip to content

Commit

Permalink
Revert "Merge pull request ceph#16715 from adamemerson/wip-I-Object!"
Browse files Browse the repository at this point in the history
This reverts commit 6694531, reversing
changes made to 36f5fcb.

Signed-off-by: Sage Weil <[email protected]>

- conflicts due to code rearrangement in 14b0db9
  • Loading branch information
liewegas committed Nov 22, 2019
1 parent 2c7aa77 commit 54ddf2c
Show file tree
Hide file tree
Showing 120 changed files with 2,177 additions and 10,233 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,3 @@ GTAGS
/src/pybind/mgr/dashboard/frontend/src/environments/environment.ts
/src/pybind/mgr/dashboard/frontend/src/environments/environment.prod.ts
/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf

# Python building things where it shouldn't
/src/python-common/build/
6 changes: 0 additions & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ if(NOT fmt_FOUND)
message(STATUS "Could not find fmt, will build it")
add_subdirectory(fmt)
endif()
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/fmt/include")

if(WITH_SEASTAR)
find_package(c-ares 1.13.0 QUIET)
Expand Down Expand Up @@ -332,13 +331,11 @@ set(libcommon_files
${CMAKE_BINARY_DIR}/src/include/ceph_ver.h
ceph_ver.c
xxHash/xxhash.c
common/error_code.cc
log/Log.cc
mon/MonCap.cc
mon/MonClient.cc
mon/MonMap.cc
mon/MonSub.cc
mon/error_code.cc
mgr/MgrClient.cc
mon/PGMap.cc
mgr/ServiceMap.cc
Expand All @@ -347,12 +344,10 @@ set(libcommon_files
osd/OSDMap.cc
osd/OSDMapMapping.cc
osd/osd_types.cc
osd/error_code.cc
osd/PGPeeringEvent.cc
osd/OpRequest.cc
osdc/Striper.cc
osdc/Objecter.cc
osdc/error_code.cc
librbd/Features.cc
${mds_files})
set_source_files_properties(ceph_ver.c
Expand Down Expand Up @@ -480,7 +475,6 @@ option(WITH_LIBRADOSSTRIPER "build with libradosstriper support" ON)

add_subdirectory(include)
add_subdirectory(librados)
add_subdirectory(RADOS)

if(WITH_LIBRADOSSTRIPER)
add_subdirectory(libradosstriper)
Expand Down
37 changes: 0 additions & 37 deletions src/RADOS/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 54ddf2c

Please sign in to comment.