]> 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: be6267f dc9a772)
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Wed, 30 Oct 2013 18:41:10 +0000 (18:41 +0000)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 30 Oct 2013 18:41:10 +0000 (18:41 +0000)
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.