]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 77ee5a0 c2c8a08)
Merge remote-tracking branch 'origin/wip-sandon-vm'
authorSandon Van Ness <sandon@inktank.com>
Fri, 26 Jul 2013 02:50:02 +0000 (19:50 -0700)
committerSandon Van Ness <sandon@inktank.com>
Fri, 26 Jul 2013 02:50:02 +0000 (19:50 -0700)
commit41cafb1a1018bd752d285f216a99a6926cd53350
tree752cc7a9b5ec406012a61593e0d7e60ba765724ftree | snapshot
parent77ee5a07142320b234a5cb99226460f75858ac48commit | diff
parentc2c8a080c7c09ce1bcc749ac0afd78422a6fc571commit | diff
Merge remote-tracking branch 'origin/wip-sandon-vm'

Conflicts:
teuthology/lock.py
teuthology/misc.py
teuthology/task/install.py
schedule_suite.sh diff1 | diff2 | blob | history
teuthology/lock.py diff1 | diff2 | blob | history
teuthology/misc.py diff1 | diff2 | blob | history
teuthology/run.py diff1 | diff2 | blob | history
teuthology/task/ceph-deploy.py diff1 | diff2 | blob | history
teuthology/task/ceph.py diff1 | diff2 | blob | history
teuthology/task/install.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.