]> 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: a48739d aca0aea)
Merge remote-tracking branch 'origin/wip-osd-throttle2' into next
authorGreg Farnum <greg@inktank.com>
Tue, 9 Apr 2013 19:11:15 +0000 (12:11 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 9 Apr 2013 19:11:15 +0000 (12:11 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/msg/Pipe.cc patch | diff1 | diff2 | blob | history

diff --cc src/msg/Pipe.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.