]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch wip-librados-timeout
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 10 Feb 2014 21:49:23 +0000 (13:49 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 10 Feb 2014 22:12:35 +0000 (14:12 -0800)
commit32aa9fdf666063e4c5539b5e850f04af37e30b2e
treef0119db5eed75fb3911ca7a7e6393a09265ba1ff
parentaf5d0fcd90625e849c9561e927122013d0fc1c40
parent9e62beb80b6c92a97ec36c0db5ea39e417661b35
Merge branch wip-librados-timeout

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
src/client/Client.cc
src/common/config_opts.h
src/mds/MDS.cc
src/osd/OSD.cc