]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9cb165 7b1fc5c)
Merge pull request #3829 from liewegas/wip-recovery-sleep
authorLoic Dachary <ldachary@redhat.com>
Sun, 22 Mar 2015 08:03:57 +0000 (09:03 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sun, 22 Mar 2015 08:03:57 +0000 (09:03 +0100)
osd: inject simple sleep in recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.