]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/jewel-14254' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Mon, 18 Jan 2016 22:33:38 +0000 (14:33 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 18 Jan 2016 22:33:38 +0000 (14:33 -0800)
https://github.com/ceph/ceph-qa-suite/pull/798

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge