]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit51e4eb779180ec88e5e588a1c25c552e780acce7
tree691303fba5da9e25fb530af1585a980f211eed71tree | snapshot
parent379cc26db531d029dd8cdeff5ec99e23373481b4commit | diff
parent8aa759054c22da40b03c6279d7dfd2ade5cfd944commit | diff
Merge PR #23742 into master

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