]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 379cc26 8aa7590)
Merge PR #23742 into master
authorSage Weil <sage@redhat.com>
Wed, 29 Aug 2018 17:25:23 +0000 (12:25 -0500)
committerSage Weil <sage@redhat.com>
Wed, 29 Aug 2018 17:25:23 +0000 (12:25 -0500)
* refs/pull/23742/head:
mon/OSDMonitor: don't change in-memory state on prune

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

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