From: Sage Weil <sage@inktank.com>
Date: Thu, 18 Jul 2013 03:59:54 +0000 (-0700)
Subject: Merge branch 'wip-machine-type'
X-Git-Tag: 1.1.0~2078
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bfd6010747344c40e1d859e27233f7b82cd50349;p=teuthology.git

Merge branch 'wip-machine-type'

Reviewed-by: Sandon Van Ness <sandon@inktank.com>
---

bfd6010747344c40e1d859e27233f7b82cd50349