]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4830895 aea898d)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sat, 19 Jan 2013 04:57:40 +0000 (20:57 -0800)
committerSage Weil <sage@inktank.com>
Sat, 19 Jan 2013 04:57:40 +0000 (20:57 -0800)
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.