]> 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: 88515b7 c43adbe)
Merge commit 'c43adbe5d679e4920791f4cf4baa294eab36ccfa'
authorSage Weil <sage@newdream.net>
Thu, 18 Sep 2008 18:38:33 +0000 (11:38 -0700)
committerSage Weil <sage@newdream.net>
Thu, 18 Sep 2008 18:38:33 +0000 (11:38 -0700)
Conflicts:

src/kernel/osd_client.c


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