From f9bd22712e995c7efe8ff5032e817fbb6de9bdb7 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Wed, 7 Nov 2018 19:19:54 +0100 Subject: port experimental change that came up in the elixir test suite branch (#1614) --- src/chttpd/src/chttpd_misc.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chttpd/src/chttpd_misc.erl b/src/chttpd/src/chttpd_misc.erl index 7b417b442..39ffa2368 100644 --- a/src/chttpd/src/chttpd_misc.erl +++ b/src/chttpd/src/chttpd_misc.erl @@ -242,7 +242,9 @@ cancel_replication(PostBody, Ctx) -> {error, badrpc}; Else -> % Unclear what to do here -- pick the first error? - hd(Else) + % Except try ignoring any {error, not_found} responses + % because we'll always get two of those + hd(Else -- [{error, not_found}]) end end. -- cgit v1.2.1 From b0f65e8b3b036ea5acde07847fb28a8754527980 Mon Sep 17 00:00:00 2001 From: Marc Abbyad Date: Wed, 7 Nov 2018 10:50:56 -0800 Subject: Fix link in contributing doc (#1608) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e345ea487..cd3a4437c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -279,7 +279,7 @@ without needing any other steps like setting git upstreams! :sparkles: ## Thanks -Special thanks to [Hoodie][https://github.com/hoodiehq/hoodie] for the great +Special thanks to [Hoodie](https://github.com/hoodiehq/hoodie) for the great CONTRIBUTING.md template. [1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/ -- cgit v1.2.1