]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
projects / teuthology.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d564e0 50e13e0)
Merge pull request #297 from ceph/wip-8712-wusui
authorZack Cerza <zack@cerza.org>
Mon, 15 Sep 2014 16:57:25 +0000 (10:57 -0600)
committerZack Cerza <zack@cerza.org>
Mon, 15 Sep 2014 16:57:25 +0000 (10:57 -0600)
Check os-type and os-version for vps

1  2 
teuthology/lock.py patch | diff1 | diff2 | blob | history
teuthology/task/internal.py patch | diff1 | diff2 | blob | history

diff --cc teuthology/lock.py
Simple merge
diff --cc teuthology/task/internal.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.