From: Sage Weil <sage@newdream.net>
Date: Thu, 7 Dec 2017 03:33:08 +0000 (-0600)
Subject: Merge pull request #18276 from liewegas/wip-removed-snaps
X-Git-Tag: wip-pdonnell-testing-20180317.202121~887
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f3b2eb9d2d6353220b368862298a04a93965842e;p=ceph-ci.git

Merge pull request #18276 from liewegas/wip-removed-snaps

mon,osd,osdc: refactor snap trimming (phase 1)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

f3b2eb9d2d6353220b368862298a04a93965842e
diff --cc qa/suites/rados/singleton/all/thrash-eio.yaml
index 5efc4154421,cea537b1c03..9e523845f45
--- a/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@@ -29,8 -29,8 +29,9 @@@ tasks
      - \(REQUEST_SLOW\)
      - \(SLOW_OPS\)
      - \(PG_
 +    - \(OBJECT_MISPLACED\)
      - \(OSD_
+     - \(OBJECT_
  - thrashosds:
      op_delay: 30
      clean_interval: 120