refs/heads/master - couchdb-couch-log - Git at Google

commit: 194db1adeafd9d5b434ae22b06aecdcb8635863e
[log]
author: Joan Touzet <joant@atypical.net>
Mon Mar 27 16:12:59 2017 -0400
committer: Joan Touzet <joant@atypical.net>
Mon Mar 27 16:12:59 2017 -0400
tree: f0c56d03dc9fcb538624d65c945f2508f8843895
parent: ad803f66dbd1900b67543259142875a6d03503ce [diff]
parent: 24112cf6ce9ed23029f7697b84548dc8acff28b5 [diff]

Merge branch '3340-fix-dns-timeout' of https://github.com/cloudant/couchdb-couch-log

tree: f0c56d03dc9fcb538624d65c945f2508f8843895