]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f95c1f 223d6fa)
Merge remote-tracking branch 'gh/wip-crypto'
authorSage Weil <sage@inktank.com>
Tue, 21 Aug 2012 22:47:57 +0000 (15:47 -0700)
committerSage Weil <sage@inktank.com>
Tue, 21 Aug 2012 22:47:57 +0000 (15:47 -0700)

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