]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edf2c34 1c50c44)
Merge remote-tracking branch 'gh/wip-6004' into next
authorSage Weil <sage@inktank.com>
Tue, 20 Aug 2013 23:57:46 +0000 (16:57 -0700)
committerSage Weil <sage@inktank.com>
Tue, 20 Aug 2013 23:57:46 +0000 (16:57 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
1  2 
src/osdc/ObjectCacher.h patch | diff1 | diff2 | blob | history

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