]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e162aab 1d9ab26)
Merge branch 'osd_snapdir' into unstable
authorSage Weil <sage@newdream.net>
Thu, 20 May 2010 17:39:57 +0000 (10:39 -0700)
committerSage Weil <sage@newdream.net>
Thu, 20 May 2010 17:39:57 +0000 (10:39 -0700)

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