]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'jewel-14395' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 19 Jan 2016 01:56:53 +0000 (17:56 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 20 Jan 2016 02:46:12 +0000 (18:46 -0800)
https://github.com/ceph/ceph-qa-suite/pull/801

Reviewed-by: John Spray <john.spray@redhat.com>

Trivial merge