]> 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: ba73ef9 3cbe5da)
Merge pull request #3315 from majianpeng/fix6
authorSage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:42:31 +0000 (10:42 -0800)
committerSage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:42:31 +0000 (10:42 -0800)
bug fix

Reviewed-by: Sage Weil <sage@redhat.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.