]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2976 from ceph/wip-pgmeta
authorSage Weil <sage@redhat.com>
Fri, 19 Dec 2014 15:19:05 +0000 (07:19 -0800)
committerSage Weil <sage@redhat.com>
Fri, 19 Dec 2014 15:19:05 +0000 (07:19 -0800)
osd: move PG metadata to a per-PG object

Passed rados and upgrade tests.

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/os/FileStore.cc
src/os/FileStore.h
src/os/MemStore.cc
src/os/MemStore.h
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/tools/ceph_objectstore_tool.cc

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