]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b88a5e5 4ec4b47)
Merge branch 'wip-keyrings'
authorSage Weil <sage@inktank.com>
Tue, 12 Jun 2012 19:48:37 +0000 (12:48 -0700)
committerSage Weil <sage@inktank.com>
Tue, 12 Jun 2012 19:48:37 +0000 (12:48 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

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