Merge remote-tracking branch 'origin/master'

chartmogul · Aug 3, 2017 · 283b0ec · 283b0ec
2 parents c546ae8 + 031a1fd
commit 283b0ec
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,10 @@ chartmogul.Ping.ping(config).get()
 ```
 This throws error or returns `<Ping{data='pong!'}>`
 
+### Options
+You can also pass to the Config initializer:
+* `request_timeout=` sets timeout for requests (seconds), default: none (see [requests docs](http://docs.python-requests.org/en/master/user/quickstart/#timeouts) for details)
+
 ## Usage
 
 The library is based on [promises](https://pypi.python.org/pypi/promise) (mechanism similar to futures).