Skip to content
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
Merged

Conversation

mrinaldi
Copy link
Contributor

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

@forki
Copy link
Member

forki commented Oct 14, 2015

Is this compatible with #1130?

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

@mrinaldi
Copy link
Contributor Author

#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
Copy link
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
@mrinaldi
Copy link
Contributor Author

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

@mrinaldi mrinaldi deleted the filter_restrictions branch October 14, 2015 18:48
@vbfox
Copy link
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants