From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 8 Mar 2016 00:31:35 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/wip-damage-table' into greg-fs-testing
X-Git-Tag: v10.2.6~165^2^2~178^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2edf7519ff18a27c960719f68f9d57ca7689262;p=ceph.git

Merge remote-tracking branch 'origin/wip-damage-table' into greg-fs-testing

https://github.com/ceph/ceph-qa-suite/pull/782

Conflicts:
	tasks/cephfs/test_scrub_checks.py

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

d2edf7519ff18a27c960719f68f9d57ca7689262