]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8ca6fad0990b2066ab2af7bd0cee64e80db19f1f
treee05a219dfba29a75a7cde33ed50df990896b8b56tree | snapshot
parent37d20dfdc5d715b5cd185f19010c83e4a03fde27commit | diff
parent3dcd4eaf867369437720a21daf3c344cc4b9844ecommit | diff
Merge PR #22630 into master

* 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>
Unnamed repository; edit this file 'description' to name the repository.