New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes combine restrictions #1137

Merged
merged 8 commits into from Oct 14, 2015

Conversation

Projects
None yet
3 participants
@mrinaldi
Contributor

mrinaldi commented Oct 14, 2015

This PR correctly combines AtLeast with Between and Exactly with Between restrictions.

@forki

This comment has been minimized.

Show comment
Hide comment
@forki

forki Oct 14, 2015

Member

Is this compatible with #1130?

/cc @vbfox could you try to include this in your pr?

Member

forki commented Oct 14, 2015

Is this compatible with #1130?

/cc @vbfox could you try to include this in your pr?

@mrinaldi

This comment has been minimized.

Show comment
Hide comment
@mrinaldi

mrinaldi Oct 14, 2015

Contributor

#1130 doesn't fix what this PR does.
However, it'd have to be rebased there.

Do you want me to rebase on top of #1130?

Contributor

mrinaldi commented Oct 14, 2015

#1130 doesn't fix what this PR does.
However, it'd have to be rebased there.

Do you want me to rebase on top of #1130?

@forki

This comment has been minimized.

Show comment
Hide comment
@forki

forki Oct 14, 2015

Member

Actually I think I will merge yours (since it seems ready) and just hope that @vbfox finds a way to merge stuff ;-)

Member

forki commented Oct 14, 2015

Actually I think I will merge yours (since it seems ready) and just hope that @vbfox finds a way to merge stuff ;-)

forki added a commit that referenced this pull request Oct 14, 2015

@forki forki merged commit cc82c98 into fsprojects:master Oct 14, 2015

2 checks passed

continuous-integration/appveyor AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mrinaldi

This comment has been minimized.

Show comment
Hide comment
@mrinaldi

mrinaldi Oct 14, 2015

Contributor

Alright. The merge should be easy, but let me know if my help is needed.

Contributor

mrinaldi commented Oct 14, 2015

Alright. The merge should be easy, but let me know if my help is needed.

@mrinaldi mrinaldi deleted the mrinaldi:filter_restrictions branch Oct 14, 2015

@vbfox

This comment has been minimized.

Show comment
Hide comment
@vbfox

vbfox Oct 15, 2015

Contributor

I don't think the merge will be too hard.

Contributor

vbfox commented Oct 15, 2015

I don't think the merge will be too hard.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment