From: Sage Weil <sage@newdream.net>
Date: Fri, 29 Dec 2017 19:38:37 +0000 (-0600)
Subject: Merge branch 'master' into lc-time-disable
X-Git-Tag: v13.0.2~241^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acf4ea1cadfd7da43ceeec9125fb3d13409d26d9;p=ceph.git

Merge branch 'master' into lc-time-disable
---

acf4ea1cadfd7da43ceeec9125fb3d13409d26d9
diff --cc qa/tasks/s3tests.py
index ee16381d1b4,954983b8e2e..00bc6b4e34a
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@@ -228,7 -228,10 +228,10 @@@ def run_tests(ctx, config)
      """
      assert isinstance(config, dict)
      testdir = teuthology.get_testdir(ctx)
 -    attrs = ["!fails_on_rgw", "!lifecycle"]
 +    attrs = ["!fails_on_rgw"]
+     # beast parser is strict about unreadable headers
+     if ctx.rgw.frontend == 'beast':
+         attrs.append("!fails_strict_rfc2616")
      for client, client_config in config.iteritems():
          args = [
              'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),