]> 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: 918a48d ad0bbc8)
Merge PR #33633 into master
authorSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 18:04:29 +0000 (12:04 -0600)
committerSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 18:04:29 +0000 (12:04 -0600)
* refs/pull/33633/head:
msg: add get_{pid,random}_nonce() helpers
msg/Policy: make stateless_server default to anon (again)
osd: drop broken 'poison pill'

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/mgr/DaemonServer.cc patch | diff1 | diff2 | blob | history

diff --cc src/mgr/DaemonServer.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.