]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8db7b08 77cf9f4)
Merge branch 'next'
authorSam Lang <sam.lang@inktank.com>
Wed, 17 Apr 2013 23:09:39 +0000 (18:09 -0500)
committerSam Lang <sam.lang@inktank.com>
Wed, 17 Apr 2013 23:09:39 +0000 (18:09 -0500)
commita629e9eec47e089718742131d66c79ddd7b41963
tree0e3aac726e4a4c9a8e7f431a7e000c646de6ad96tree | snapshot
parent8db7b08ee60c4829a3d51e829ca92720968cbaf8commit | diff
parent77cf9f4b682b8555278532fedd9d07951a09cddecommit | diff
Merge branch 'next'

Conflicts:
teuthology/lock.py
teuthology/lockstatus.py
teuthology/misc.py
teuthology/task/install.py
teuthology/misc.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.