]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c41e6ff a4994e3)
Merge branch 'wip-teuthVm-wusui'
authorWarren Usui <warren.usui@inktank.com>
Mon, 10 Jun 2013 16:46:42 +0000 (09:46 -0700)
committerWarren Usui <warren.usui@inktank.com>
Mon, 10 Jun 2013 16:46:42 +0000 (09:46 -0700)
1  2 
teuthology/lock.py patch | diff1 | diff2 | blob | history

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