]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-mon-compact' into next
authorSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 18:49:31 +0000 (11:49 -0700)
committerSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 18:49:31 +0000 (11:49 -0700)
commit17612a407ab7bd1d08945d663e2088c5c81cee33
treefe89353ff145e31d3c9caf1364dae63832fc672d
parent6ae9bbb5d03cb5695a4ebb7a3c20f729de1bd67a
parentbd68b82bd6e9e119257ecf351b04c085ee4897db
Merge branch 'wip-mon-compact' into next

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/common/config_opts.h
src/mon/Monitor.cc