Skip to content

Commit 283b0ec

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents c546ae8 + 031a1fd commit 283b0ec

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ chartmogul.Ping.ping(config).get()
6161
```
6262
This throws error or returns `<Ping{data='pong!'}>`
6363

64+
### Options
65+
You can also pass to the Config initializer:
66+
* `request_timeout=` sets timeout for requests (seconds), default: none (see [requests docs](http://docs.python-requests.org/en/master/user/quickstart/#timeouts) for details)
67+
6468
## Usage
6569

6670
The library is based on [promises](https://pypi.python.org/pypi/promise) (mechanism similar to futures).

0 commit comments

Comments
 (0)