From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Feb 2019 17:18:46 +0000 (-0600)
Subject: Merge PR #26237 into master
X-Git-Tag: v14.1.0~20
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0a7077a8552208ffab027383ac86e00311d1d634;p=ceph-ci.git

Merge PR #26237 into master

* 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>
---

0a7077a8552208ffab027383ac86e00311d1d634
diff --cc src/tools/CMakeLists.txt
index 234f9491a95,42b72560c1e..d31f3d24084
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@@ -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)