]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32701 into master
authorSage Weil <sage@redhat.com>
Sat, 18 Jan 2020 01:13:11 +0000 (19:13 -0600)
committerSage Weil <sage@redhat.com>
Sat, 18 Jan 2020 01:13:11 +0000 (19:13 -0600)
* refs/pull/32701/head:
qa/tasks/ceph_manager: fix ceph-objectstore-tool calls
qa/tasks/ceph_manager: fix admin_socket remote when using cephadm
qa/tasks/ceph_manager: --no-mon-config to ceph-objectstore-tool
qa/tasks/ceph_manager: fix filestore split command
qa/tasks/ceph_manager: fix import line

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

Trivial merge