tree e72c7fd15c385d5ad69b52ed85216cc8667d5d96
parent fc4e64d84f4de068cb54db635ad9900bb187289a
parent 0c012f843c1e0de09beca23cf3f16007ca01979b
author Joan Touzet <wohali@apache.org> 1468439882 -0400
committer Joan Touzet <wohali@apache.org> 1468439882 -0400

Merge branch '3040-skip-os-daemon-tests' of https://github.com/wohali/couchdb-couch