]> 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: 39c84fa 794e3df)
Merge PR #27155 into master
authorSage Weil <sage@redhat.com>
Tue, 26 Mar 2019 16:35:45 +0000 (11:35 -0500)
committerSage Weil <sage@redhat.com>
Tue, 26 Mar 2019 16:35:45 +0000 (11:35 -0500)
* refs/pull/27155/head:
mon/ConfigMonitor: make 'config reset' idempotent

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

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