From 17691a187b34c9e85741b8256cbd1686f3e7614a Mon Sep 17 00:00:00 2001
From: Will Holley <willholley@gmail.com>
Date: Sun, 1 Feb 2015 21:34:05 +0000
Subject: [PATCH] Respect conflicts=true when collecting clustered changes

This correctly reads the conflicts parameter from #changes_args.
Previously we were attempting to look for a conflicts property in
Options which was never set (so always evaluated to false).

Fixes COUCHDB-2518
---
 src/fabric_rpc.erl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 6ee11b0..4a7881a 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -298,12 +298,14 @@ changes_enumerator(#doc_info{id= <<"_local/", _/binary>>, high_seq=Seq}, Acc) ->
 changes_enumerator(DocInfo, Acc) ->
     #cacc{
         db = Db,
-        args = #changes_args{include_docs = IncludeDocs, filter_fun = Filter},
-        options = Options,
+        args = #changes_args{
+            include_docs = IncludeDocs,
+            conflicts = Conflicts,
+            filter_fun = Filter
+        },
         pending = Pending,
         epochs = Epochs
     } = Acc,
-    Conflicts = proplists:get_value(conflicts, Options, false),
     #doc_info{id=Id, high_seq=Seq, revs=[#rev_info{deleted=Del}|_]} = DocInfo,
     case [X || X <- couch_changes:filter(Db, DocInfo, Filter), X /= null] of
     [] ->