]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15562 from tchaikov/wip-no-assert.h
authorSage Weil <sage@newdream.net>
Fri, 9 Jun 2017 01:38:23 +0000 (20:38 -0500)
committerGitHub <noreply@github.com>
Fri, 9 Jun 2017 01:38:23 +0000 (20:38 -0500)
common,osdc: remove atomic_t completely

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
CMakeLists.txt
ceph.spec.in
debian/control
src/include/config-h.in.cmake
src/mgr/DaemonServer.cc
src/mgr/Mgr.cc
src/rgw/rgw_rados.cc

diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
Simple merge
Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
Simple merge