]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge branch 'master' of github.com:ceph/teuthology
authorMark Nelson <nhm@clusterfaq.org>
Fri, 29 Jun 2012 19:36:58 +0000 (14:36 -0500)
committerMark Nelson <nhm@clusterfaq.org>
Fri, 29 Jun 2012 19:36:58 +0000 (14:36 -0500)

Trivial merge