]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-mon-mkfs'
authorSage Weil <sage@inktank.com>
Thu, 23 Aug 2012 19:59:28 +0000 (12:59 -0700)
committerSage Weil <sage@inktank.com>
Thu, 23 Aug 2012 19:59:28 +0000 (12:59 -0700)
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/mon/Monitor.cc

Simple merge