]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25378 into master
authorSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 14:41:44 +0000 (08:41 -0600)
committerSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 14:41:44 +0000 (08:41 -0600)
* refs/pull/25378/head:
mgr/hello: add serve() method

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Trivial merge