]> 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: ac20f38 4872353)
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Tue, 1 Dec 2015 13:51:48 +0000 (08:51 -0500)
committerSage Weil <sage@redhat.com>
Tue, 1 Dec 2015 13:51:48 +0000 (08:51 -0500)
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.