]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #9138 from cxwshawn/wip-cl-fix
authorKefu Chai <tchaikov@gmail.com>
Mon, 11 Jul 2016 05:36:42 +0000 (13:36 +0800)
committerGitHub <noreply@github.com>
Mon, 11 Jul 2016 05:36:42 +0000 (13:36 +0800)
osd: replace ceph:atomic_t with std::atomic in osd module.

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/osd_types.h

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge