Merge branch 'master' of https://github.com/prometheus/client_python

rossigee · rossigee · commit a67bf463c64b · 2017-01-17T12:09:50.000+07:00
diff --git a/README.md b/README.md
@@ -380,8 +380,6 @@ return an empty list.
 
 ## Multiprocess Mode (Gunicorn)
 
-**Experimental: This feature is new and has rough edges.**
-
 Prometheus client libaries presume a threaded model, where metrics are shared
 across workers. This doesn't work so well for languages such as Python where
 it's common to have processes rather than threads to handle large workloads.
@@ -393,7 +391,7 @@ This comes with a number of limitations:
 - Custom collectors do not work (e.g. cpu and memory metrics)
 - The pushgateway cannot be used
 - Gauges cannot use the `pid` label
-- Gunicron's `preload_app` feature is not supported
+- Gunicron's `preload_app` feature are equivilents are not supported
 
 There's several steps to getting this working:
 
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
     keywords = "prometheus monitoring instrumentation client",
     url = "https://github.com/prometheus/client_python",
     packages=['prometheus_client', 'prometheus_client.bridge', 'prometheus_client.twisted', 'prometheus_client.handlers'],
-    extras_requires={
+    extras_require={
         'twisted': ['twisted'],
     },
     test_suite="tests",
