]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge branch 'wip-machine-type'
authorSage Weil <sage@inktank.com>
Thu, 18 Jul 2013 03:59:54 +0000 (20:59 -0700)
committerSage Weil <sage@inktank.com>
Thu, 18 Jul 2013 03:59:54 +0000 (20:59 -0700)
Reviewed-by: Sandon Van Ness <sandon@inktank.com>

Trivial merge