Sage Weil 8a18d8baaf Merge remote-tracking branch 'gh/giant' into m ... Conflicts: tasks/ceph_manager.py		2014-10-29 14:31:26 -07:00
..
dumpling-x/basic	multiversion/dumpling-x: remove rgw	2014-10-14 11:08:43 -07:00
firefly-giant/basic	added multi-version for giant-clients vs firefly-servers	2014-09-24 02:42:31 -07:00
firefly-x/basic	Fixing branch assumptions	2014-10-01 14:47:07 -07:00