John Spray 48a0b75928 Merge remote-tracking branch 'origin/giant' into wip-merge ... Conflicts: erasure-code/ec-rados-default.yaml tasks/mds_client_limits.py tasks/mds_client_recovery.py tasks/mds_journal_migration.py		2014-10-01 18:17:01 +01:00
..
dumpling-emperor-x/parallel	erasure-code: fix bugous ec-rados-default.yaml in some suites	2014-09-21 18:58:43 +02:00
dumpling-firefly-giant/parallel	remove dumpling-firefly-giant as dumpling-firefly-x covers this test	2014-09-30 17:21:20 -07:00
dumpling-firefly-x/parallel	fixed firefly-x and dumpling-firefly-x	2014-09-30 17:20:01 -07:00
dumpling-giant-x/stress-split	Merge remote-tracking branch 'origin/giant' into wip-merge	2014-10-01 18:17:01 +01:00
dumpling-x	erasure-code: fix bugous ec-rados-default.yaml in some suites	2014-09-21 18:58:43 +02:00
firefly-giant-x/parallel	Merge remote-tracking branch 'origin/giant' into wip-merge	2014-10-01 18:17:01 +01:00
firefly-x	fixed firefly-x and dumpling-firefly-x	2014-09-30 17:20:01 -07:00