]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c8c618 38fd666)
Merge remote-tracking branch 'gh/wip-7210' into firefly
authorSage Weil <sage@inktank.com>
Fri, 7 Mar 2014 23:23:31 +0000 (15:23 -0800)
committerSage Weil <sage@inktank.com>
Fri, 7 Mar 2014 23:23:31 +0000 (15:23 -0800)
Reviewed-by: Sage Weil <sage@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.