]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd7ed1ccf48839a61578f37ffef50b7712dcdaf04
tree2e2b12c31cb92bb5c605eebdf256a85247a72d8ftree | snapshot
parent228cffa10782bebb58eacd7f67ca5f2b61897675commit | diff
parentd4da1f59fc947891ae8c8ee8afb9427a4c6fcf4dcommit | diff
Merge PR #25125 into master

* refs/pull/25125/head:
mon: require keyring even if cephx is optional

Reviewed-by: Sage Weil <sage@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.