]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit75f17a222b2a17d2aa34e0b8c1c02a9f22ca3e9c
treed73bb065abdea47e9e9d0a3a1ca88faad88a25fd
parentb84730a921df318f484439e247af6f754b230752
parent3c361fde293ef6062e71e1dc1cd89779e46c2fa3
Merge PR #24844 into master

* 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>
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h