]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5511 from ceph/wip-cxx11
authorSamuel Just <sam.just@inktank.com>
Fri, 7 Aug 2015 15:56:38 +0000 (08:56 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 7 Aug 2015 15:56:38 +0000 (08:56 -0700)
c++11 ftw

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
configure.ac
src/CMakeLists.txt
src/mon/OSDMonitor.cc
src/os/RocksDBStore.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/osd_types.h
src/test/test_cors.cc
src/test/test_rgw_admin_meta.cc

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
Simple merge
Simple merge
Simple merge