]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24579 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 12:17:59 +0000 (07:17 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 12:17:59 +0000 (07:17 -0500)
* refs/pull/24579/head:
qa/osd: fixup osd-rep-recov-eio.sh fails to parse pg dump

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge