GitHub user willholley opened a pull request:

    https://github.com/apache/couchdb-fabric/pull/11

    Respect conflicts=true when collecting clustered changes

    This looks to be a relatively straightforward fix. Previously we attempted 
to look for a conflicts property in Options which was never set (so always 
evaluated to false). In this PR I've changed changes_enumerator/2 so that it 
uses the conflicts field from #changes_args which is populated correctly from 
the query parameters.
    
    Fixes COUCHDB-2518

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/willholley/couchdb-fabric 
2518-support-conflicts-param-for-changes

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/couchdb-fabric/pull/11.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #11
    
----
commit 6359f93d6647509d5fc10c28af4afbdbdea89fcf
Author: Will Holley <[email protected]>
Date:   2015-02-01T21:34:05Z

    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

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to