]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-mon-osd-create-fix' into next
authorSage Weil <sage@inktank.com>
Thu, 29 Nov 2012 23:34:32 +0000 (15:34 -0800)
committerSage Weil <sage@inktank.com>
Thu, 29 Nov 2012 23:34:32 +0000 (15:34 -0800)
1  2 
src/mon/Monitor.cc
src/mon/OSDMonitor.cc

Simple merge
Simple merge