]> 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: b65cef6 7025075)
Merge remote-tracking branch 'gh/firefly-next' into firefly
authorSage Weil <sage@redhat.com>
Sat, 9 Aug 2014 02:05:37 +0000 (19:05 -0700)
committerSage Weil <sage@redhat.com>
Sat, 9 Aug 2014 02:05:37 +0000 (19:05 -0700)
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.