tree f0c56d03dc9fcb538624d65c945f2508f8843895
parent ad803f66dbd1900b67543259142875a6d03503ce
parent 24112cf6ce9ed23029f7697b84548dc8acff28b5
author Joan Touzet <joant@atypical.net> 1490645579 -0400
committer Joan Touzet <joant@atypical.net> 1490645579 -0400

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