From: Sage Weil <sage@inktank.com>
Date: Sun, 4 Aug 2013 21:54:26 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: 1.1.0~1995
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=18580c1d9c28971794c17f5319ff6c6ff23d98ae;p=teuthology.git

Merge remote-tracking branch 'gh/next'
---

18580c1d9c28971794c17f5319ff6c6ff23d98ae