]> 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: e20fbac 17114f2)
Merge remote-tracking branch 'gh/wip-osd-peering'
authorSage Weil <sage@newdream.net>
Mon, 7 May 2012 16:25:12 +0000 (09:25 -0700)
committerSage Weil <sage@newdream.net>
Mon, 7 May 2012 16:25:12 +0000 (09:25 -0700)
Reviewed-by: Sam Just <sam.just@inktank.com>

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