]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-8438' into firefly-next
authorSamuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:28:14 +0000 (11:28 -0700)
committerSamuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:28:14 +0000 (11:28 -0700)
Backport of c5b8d8105d965da852c79add607b69d5ae79a4d4

12 files changed:
1  2 
src/osd/ECBackend.cc
src/osd/ECBackend.h
src/osd/PG.cc
src/osd/PG.h
src/osd/PGBackend.cc
src/osd/PGBackend.h
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedBackend.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h

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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge