]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 720bea4 42f2d2f)
Merge branch 'wip-crush-update'
authorSage Weil <sage@inktank.com>
Fri, 4 May 2012 03:44:20 +0000 (20:44 -0700)
committerSage Weil <sage@inktank.com>
Fri, 4 May 2012 03:44:20 +0000 (20:44 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/OSDMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.