]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24844 into master
authorSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:51:29 +0000 (06:51 -0600)
committerSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:51:29 +0000 (06:51 -0600)
* refs/pull/24844/head:
osd: drop PGBackend::Listener::get_epoch().
osd: massively switch to get_osdmap_epoch().
osd: switch the return type of PG::get_osdmap().

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h

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