From: Sage Weil <sage@inktank.com>
Date: Wed, 20 Feb 2013 05:04:24 +0000 (-0800)
Subject: Merge branch 'unstable'
X-Git-Tag: v10.2.8~13^2~2^2~4^2~4^2~5^2~3^2~1^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cccadb9b03ca4421a5fd841a61bf252c329e3649;p=ceph-ci.git

Merge branch 'unstable'

Conflicts:
	teuthology/task/workunit.py
---

cccadb9b03ca4421a5fd841a61bf252c329e3649