]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37d20df 3dcd4ea)
Merge PR #22630 into master
authorSage Weil <sage@redhat.com>
Fri, 22 Jun 2018 18:00:25 +0000 (13:00 -0500)
committerSage Weil <sage@redhat.com>
Fri, 22 Jun 2018 18:00:25 +0000 (13:00 -0500)
* refs/pull/22630/head:
osd/OSDMap.cc: move sanity checks to the proper place
osd/OSDMap.cc: remove pg_upmap/pg_upmap_items too if osd is gone

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.