You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by willholley <gi...@git.apache.org> on 2015/02/02 09:17:36 UTC
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
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 <wi...@gmail.com>
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by willholley <gi...@git.apache.org>.
GitHub user willholley reopened 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 <wi...@gmail.com>
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/couchdb-fabric/pull/11
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by willholley <gi...@git.apache.org>.
Github user willholley commented on the pull request:
https://github.com/apache/couchdb-fabric/pull/11#issuecomment-72524473
After looking at COUCHDB-2522 I think this is the wrong fix. Instead we should be figuring out how to populate Options correctly...
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by willholley <gi...@git.apache.org>.
Github user willholley commented on the pull request:
https://github.com/apache/couchdb-fabric/pull/11#issuecomment-72532030
Ah no - I think I was right the first time. COUCHDB-2522 is broken because we're not populating/handling #changes_args.doc_options.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by willholley <gi...@git.apache.org>.
Github user willholley closed the pull request at:
https://github.com/apache/couchdb-fabric/pull/11
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fabric pull request: Respect conflicts=true when collectin...
Posted by kxepal <gi...@git.apache.org>.
Github user kxepal commented on the pull request:
https://github.com/apache/couchdb-fabric/pull/11#issuecomment-72678476
+1
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---