]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #23092 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Sep 2018 12:33:49 +0000 (07:33 -0500)
committerSage Weil <sage@redhat.com>
Wed, 19 Sep 2018 12:33:49 +0000 (07:33 -0500)
* refs/pull/23092/head:
common: drop RefCountObject.cc and improve inlineability.

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/common/CMakeLists.txt
src/common/RefCountedObj.h
src/crimson/CMakeLists.txt

index 0ef903ef92826c1f7f38bdc9012be9e2870085ef,7ed55fdb51b45ba730c6bf78db752ac8e687d0f8..0820b11e6b6de74ca347284ab69494f223b07ad5
@@@ -20,9 -21,9 +20,8 @@@ set(common_src
    Mutex.cc
    OutputDataSocket.cc
    PluginRegistry.cc
 -  PrebufferedStreambuf.cc
    PriorityCache.cc
    Readahead.cc
-   RefCountedObj.cc
    SloppyCRCMap.cc
    SubProcess.cc
    Thread.cc
Simple merge
Simple merge