]> 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: 4384e59 881e9d8)
Merge branch 'wip-osd-map' into next
authorSamuel Just <sam.just@inktank.com>
Fri, 8 Mar 2013 20:44:42 +0000 (12:44 -0800)
committerSamuel Just <sam.just@inktank.com>
Fri, 8 Mar 2013 20:45:41 +0000 (12:45 -0800)
Fixes: 4369
Backport: bobtail
Reviewed-by: Samuel Just <sam.just@inktank.com>

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