]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-mon-scrub'
authorJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 15:46:32 +0000 (16:46 +0100)
committerJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 15:46:32 +0000 (16:46 +0100)
commitc2d6e3d666c782a1d356bc03060ffd730b3ed902
tree68d34bf05187438cec30b40c31c008d2279eee4b
parentf735a9905ca2b79cde85723b23a0f4128927d27a
parent29349090c2cf5d1a5d0c66c95835c10f7b6093d1
Merge branch 'wip-mon-scrub'

Reviewed-by: Sage Weil <sage@redhat.com>
src/common/config_opts.h
src/mon/Monitor.cc
src/mon/Monitor.h