Josh Durgin c8721b956c Merge branch 'wip-osd-caps' ... Conflicts: src/osd/OSDCap.cc src/test/osd/osdcap.cc Reviewed-by: Sage Weil <sage.weil@inktank.com>		2012-10-05 16:21:12 -07:00
..
1	remove obsync	2012-09-17 18:23:39 -07:00
8	Merge branch 'wip-osd-caps'	2012-10-05 16:21:12 -07:00
index.rst	doc: Fix toctree structure for man obsync(1).	2012-08-02 15:56:57 -07:00