]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eb19c8 fa1f894)
Merge branch 'unstable'
authorSage Weil <sage@inktank.com>
Wed, 20 Feb 2013 05:04:24 +0000 (21:04 -0800)
committerSage Weil <sage@inktank.com>
Wed, 20 Feb 2013 05:04:24 +0000 (21:04 -0800)
Conflicts:
teuthology/task/workunit.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.