]> git.apps.os.sepia.ceph.com Git - teuthology.git/commit
Merge branch 'localdir'
authorTommi Virtanen <tommi.virtanen@dreamhost.com>
Wed, 13 Jul 2011 19:38:12 +0000 (12:38 -0700)
committerTommi Virtanen <tommi.virtanen@dreamhost.com>
Wed, 13 Jul 2011 19:38:12 +0000 (12:38 -0700)
commitc88ef9e7f7cbe7b2ae8d4bc4e1d3794619e33cd3
treebe4affa4c809f45ff39416d743b7b7c04bbdd0f0
parent69a6b04b48c657780dd1be2d024430a14f489833
parent127ef6861c04de7aada5d99279a39c3d1d258a9c
Merge branch 'localdir'

Conflicts:
teuthology/task/ceph.py
teuthology/task/ceph.py