Sage Weil 8a18d8baaf Merge remote-tracking branch 'gh/giant' into m ... Conflicts: tasks/ceph_manager.py		2014-10-29 14:31:26 -07:00
..
ec-rados-plugin=jerasure-k=2-m=1.yaml	erasure-code: fix bugous ec-rados-default.yaml in some suites	2014-10-20 14:39:33 -07:00