]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 228cffa d4da1f5)
Merge PR #25125 into master
authorSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:49:54 +0000 (06:49 -0600)
committerSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:49:54 +0000 (06:49 -0600)
* refs/pull/25125/head:
mon: require keyring even if cephx is optional

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

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