]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge branch 'wip-teuth4768a-wusui'
authorWarren Usui <warren.usui@inktank.com>
Wed, 8 May 2013 02:27:51 +0000 (19:27 -0700)
committerWarren Usui <warren.usui@inktank.com>
Wed, 8 May 2013 02:27:51 +0000 (19:27 -0700)
Conflicts:
teuthology/task/install.py


Trivial merge