]> 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: 8de8499 f4be4b9)
Merge remote branch 'origin/objecter_ratelimit' into unstable
authorSage Weil <sage@newdream.net>
Tue, 21 Sep 2010 18:00:23 +0000 (11:00 -0700)
committerSage Weil <sage@newdream.net>
Tue, 21 Sep 2010 18:00:23 +0000 (11:00 -0700)
1  2 
src/config.cc patch | diff1 | diff2 | blob | history

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