]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1064 from ceph/port/libc++
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 23 Jan 2014 08:27:30 +0000 (00:27 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 23 Jan 2014 08:27:30 +0000 (00:27 -0800)
support libc++
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 files changed:
1  2 
src/common/hobject.h
src/include/encoding.h
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/OSDMap.cc
src/osd/OpRequest.h
src/osd/PG.cc
src/osd/PG.h
src/osd/PGLog.h
src/osd/osd_types.h
src/test/osd/RadosModel.h

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