Merge "Set default wsgi workers to cpu_count"

etc/object-server.conf-sample

@@ -3,7 +3,6 @@
 # bind_port = 6000
 # bind_timeout = 30
 # backlog = 4096
-# workers = 1
 # user = swift
 # swift_dir = /etc/swift
 # devices = /srv/node
@@ -11,6 +10,13 @@
 # disable_fallocate = false
 # expiring_objects_container_divisor = 86400
 #
+# Use an integer to override the number of pre-forked processes that will
+# accept connections.
+# workers = auto
+#
+# Maximum concurrent requests per worker
+# max_clients = 1024
+#
 # You can specify default log routing here if you want:
 # log_name = swift
 # log_facility = LOG_LOCAL0
@@ -74,7 +80,6 @@ use = egg:swift#object
 # allowed_headers = Content-Disposition, Content-Encoding, X-Delete-At, X-Object-Manifest, X-Static-Large-Object
 #
 # auto_create_account_prefix = .
-# max_clients = 1024
 #
 # Configure parameter for creating specific server
 # To handle all verbs, including replication verbs, do not specify