]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #26237 into master
authorSage Weil <sage@redhat.com>
Thu, 21 Feb 2019 17:18:46 +0000 (11:18 -0600)
committerSage Weil <sage@redhat.com>
Thu, 21 Feb 2019 17:18:46 +0000 (11:18 -0600)
* refs/pull/26237/head:
Revert "qa: update test_envlibrados_for_rocksdb.sh for libradospp split"
doc/librados: explicitly mention that the C++ API is not stable
ceph.spec: force use of upgrade devtoolset-gcc under RHEL 7
librados: add symbol versioning to the C++ API
librados: add symbol versioning to the C API
librados: revert librados3/libradoscc back to librados2

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
ceph.spec.in
debian/control
src/tools/CMakeLists.txt

diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
index 234f9491a95ad24581aacdf43dd82fb28fea30c3,42b72560c1e2095e0db06f28cb5a007995a41f2b..d31f3d240844abe4d5c9f6ba978d764febb50bfa
@@@ -100,12 -100,10 +100,12 @@@ add_executable(ceph-authtool ${ceph_aut
  target_link_libraries(ceph-authtool global ${EXTRALIBS} ${CRYPTO_LIBS})
  install(TARGETS ceph-authtool DESTINATION bin)
  
 +if(WITH_TESTS)
  set(cephdeduptool_srcs ceph_dedup_tool.cc)
  add_executable(cephdeduptool ${cephdeduptool_srcs})
- target_link_libraries(cephdeduptool librados-cxx global cls_cas_client)
+ target_link_libraries(cephdeduptool librados global cls_cas_client)
  install(TARGETS cephdeduptool DESTINATION bin)
 +endif(WITH_TESTS)
  
  if(WITH_CEPHFS)
    add_subdirectory(cephfs)