Merge branch '1901-atomic-multipart-retries' of https://github.com/apache/couchdb
authorDirkjan Ochtman <djc@apache.org>
Thu, 3 Oct 2013 18:47:09 +0000 (20:47 +0200)
committerDirkjan Ochtman <djc@apache.org>
Thu, 3 Oct 2013 18:47:35 +0000 (20:47 +0200)
commit4ca2ceccfb360c76f4e6033d93fa9fedd34d9ce7
treed4bec7a259989d3b8e2ac6e9448b7946eac65adc
parent1c3ddcb6be3135379249a2261e6ad8ed59945bc2
parentdf0423b5d5c35170626cfc0c10216d2e72e3a83e
Merge branch '1901-atomic-multipart-retries' of https://github.com/apache/couchdb

Merged after r+ from rnewson on IRC, general trustworthiness of process.