]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #28363 into master
authorSage Weil <sage@redhat.com>
Thu, 6 Jun 2019 17:14:49 +0000 (12:14 -0500)
committerSage Weil <sage@redhat.com>
Thu, 6 Jun 2019 17:14:49 +0000 (12:14 -0500)
commit5e569e1cf67f7b2b9e73937d1c063603a6b67c40
tree98074eaa5f9b73c571847a309bad0a2ef1d4795c
parent2964297b9a2f2e502299647c036e1485ae14150b
parent11689c0e88055c1c6c7ee30c2a9e31bcf9286224
Merge PR #28363 into master

* refs/pull/28363/head:
osd/ClassHandler: use std::variant for storing func
osd/ClassHandler: no need to add `struct` before struct type
osd/ClassHandler: use ceph::mutex instead of Mutex
osd/ClassHandler: remove unused function
osd/ClassHandler: s/string/std::string/ in header

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>