]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e27f0b1 b15e3b4)
Merge branch 'objectcacher' into unstable
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 25 Oct 2010 23:51:38 +0000 (16:51 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Mon, 25 Oct 2010 23:51:38 +0000 (16:51 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.