From 6a3bd70d2b6a8961f8bb1c16df58b4d7a3e83836 Mon Sep 17 00:00:00 2001
From: John Ryding <john@thegroundwork.com>
Date: Tue, 22 Mar 2016 09:20:42 -0500
Subject: [PATCH] Add gthread and gaiohttp to settings docs

---
 docs/source/settings.rst | 2 ++
 gunicorn/config.py       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 133bda35..bdb38df5 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -102,6 +102,8 @@ A string referring to one of the following bundled classes:
 * ``eventlet`` - Requires eventlet >= 0.9.7
 * ``gevent``   - Requires gevent >= 0.13
 * ``tornado``  - Requires tornado >= 0.2
+* ``gthread``  - Python 2 requires the futures package to be installed
+* ``gaiohttp`` - Requires Python 3.4 and aiohttp >= 0.21.5
 
 Optionally, you can provide your own worker by giving Gunicorn a
 Python path to a subclass of ``gunicorn.workers.base.Worker``.
diff --git a/gunicorn/config.py b/gunicorn/config.py
index 47bc09fc..0f9a2822 100644
--- a/gunicorn/config.py
+++ b/gunicorn/config.py
@@ -574,6 +574,8 @@ class WorkerClass(Setting):
         * ``eventlet`` - Requires eventlet >= 0.9.7
         * ``gevent``   - Requires gevent >= 0.13
         * ``tornado``  - Requires tornado >= 0.2
+        * ``gthread``  - Python 2 requires the futures package to be installed
+        * ``gaiohttp`` - Requires Python 3.4 and aiohttp >= 0.21.5
 
         Optionally, you can provide your own worker by giving Gunicorn a
         Python path to a subclass of ``gunicorn.workers.base.Worker``.