]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c1c882 9a9418e)
Merge branch 'stable'
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 24 May 2012 16:47:41 +0000 (09:47 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 24 May 2012 16:47:41 +0000 (09:47 -0700)

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