]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23680 from k0ste/luminous_backports
authorYuri Weinstein <yweinste@redhat.com>
Fri, 14 Sep 2018 16:47:36 +0000 (09:47 -0700)
committerGitHub <noreply@github.com>
Fri, 14 Sep 2018 16:47:36 +0000 (09:47 -0700)
luminous: osd: backport 'bench' and stdout changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge