]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/wip-crush'
authorSage Weil <sage@inktank.com>
Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
committerSage Weil <sage@inktank.com>
Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
commitffe8235f3469503ca415c85d83567a01bd261618
tree92fb4192f70d539f772476ddb16bc1ce7907cddf
parent7f65c5129a803ebe6061305d00fe08656f3422d9
parent4f2051c4a156ac2b0772bda7ef33931c5ff0f75e
Merge remote-tracking branch 'gh/wip-crush'

The non-crush bits
Reviewed-by: Dan Mick <dan.mick@inktank.com>
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h