]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-osd-uuid'
authorSage Weil <sage@inktank.com>
Fri, 4 May 2012 03:43:54 +0000 (20:43 -0700)
committerSage Weil <sage@inktank.com>
Fri, 4 May 2012 03:43:54 +0000 (20:43 -0700)
commit720bea4a71a3a88fc89c884f35b366f3a79e8adb
tree0496b3651959956e3152350e1a2a9aa38187ee76
parent72538c0f18825dfc35dab6140438cf251e98dbb7
parent16461acf6add86968c0195e3e29d40512f9ba253
Merge branch 'wip-osd-uuid'

Reviewed-by: Greg Farnum <greg@inktank.com>
src/common/config_opts.h
src/mon/OSDMonitor.cc