Merge "Small cleanup on s3api"

doc/s3api/conf/ceph-s3.conf.in

@@ -1,18 +0,0 @@
-[DEFAULT]
-host = localhost
-port = 8080
-is_secure = no
-
-[s3 main]
-user_id = %ADMIN_ACCESS_KEY%
-display_name = %ADMIN_ACCESS_KEY%
-email = %ADMIN_ACCESS_KEY%
-access_key = %ADMIN_ACCESS_KEY%
-secret_key = %ADMIN_SECRET_KEY%
-
-[s3 alt]
-user_id = %TESTER_ACCESS_KEY%
-display_name = %TESTER_ACCESS_KEY%
-email = %TESTER_ACCESS_KEY%
-access_key = %TESTER_ACCESS_KEY%
-secret_key = %TESTER_SECRET_KEY%

doc/s3api/conf/object-server.conf.in

@@ -1,17 +0,0 @@
-[DEFAULT]
-user = %USER%
-bind_port = 6000
-swift_dir = %TEST_DIR%/etc
-devices = %TEST_DIR%
-mount_check = false
-workers = 1
-log_level = DEBUG
-
-[pipeline:main]
-pipeline = object-server
-
-[app:object-server]
-use = egg:swift#object
-allowed_headers = Cache-Control, Content-Disposition, Content-Encoding,
- Content-Language, Expires, X-Delete-At, X-Object-Manifest, X-Robots-Tag,
- X-Static-Large-Object

swift/common/middleware/s3api/utils.py

@@ -20,7 +20,6 @@ import re
 import time
 import uuid
 
-# Need for check_path_header
 from swift.common import utils
 
 MULTIUPLOAD_SUFFIX = '+segments'