[couchdb] branch master updated: port experimental change that came up in the elixir test suite branch (#1614)

[wohali]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new f9bd227  port experimental change that came up in the elixir test 
suite branch (#1614)
f9bd227 is described below

commit f9bd22712e995c7efe8ff5032e817fbb6de9bdb7
Author: Jan Lehnardt <j...@apache.org>
AuthorDate: Wed Nov 7 19:19:54 2018 +0100

    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 7b417b4..39ffa23 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.