]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'luminous' into wip-22724 20055/head
authorDavid Zafman <dzafman@redhat.com>
Thu, 25 Jan 2018 19:44:18 +0000 (11:44 -0800)
committerGitHub <noreply@github.com>
Thu, 25 Jan 2018 19:44:18 +0000 (11:44 -0800)
commit80de33b1ca215046290160fcc2781f3b29cb5c35
treee573453a6db3b8e1d170a426d818432d9bf80be5
parent7522ddd97845b8c2a15ad81a30b46a69e6f1444c
parent09baff4bbbaa80d57ecb130b7921f19e9df03e8f
Merge branch 'luminous' into wip-22724
src/mon/PGMap.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h