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

Fix issue 944: fix up logic for custom key deserializers for enums. #945

Merged
merged 2 commits into from
Sep 24, 2015
Merged

Fix issue 944: fix up logic for custom key deserializers for enums. #945

merged 2 commits into from
Sep 24, 2015

Conversation

bimargulies
Copy link

This fixes issue #944: problems with custom key deserializers.

@cowtowncoder
Copy link
Member

Ok sounds good. One question: this is against master, which would be for 2.7.0-SNAPSHOT. What is the easiest way to merge it back to 2.6 branch, if I merge this?

@cowtowncoder
Copy link
Member

Or, conversely, would it be possible to redo PR for 2.6 branch.

@bimargulies
Copy link
Author

I built it against 2.6 and then made the PR wrong. I can fix it later or
you can use git cherry-pick.
On Sep 24, 2015 5:38 PM, "Tatu Saloranta" [email protected] wrote:

Ok sounds good. One question: this is against master, which would be for
2.7.0-SNAPSHOT. What is the easiest way to merge it back to 2.6 branch, if
I merge this?


Reply to this email directly or view it on GitHub
#945 (comment)
.

@bimargulies
Copy link
Author

I can remake the PR in a few hours.
On Sep 24, 2015 5:42 PM, "Tatu Saloranta" [email protected] wrote:

Or, conversely, would it be possible to redo PR for 2.6 branch.


Reply to this email directly or view it on GitHub
#945 (comment)
.

@cowtowncoder
Copy link
Member

That's ok, I can try my luck with cherry-pick I think :)

cowtowncoder added a commit that referenced this pull request Sep 24, 2015
…lizer

Fix issue 944: fix up logic for custom key deserializers for enums.
@cowtowncoder cowtowncoder merged commit f4f71b9 into FasterXML:master Sep 24, 2015
cowtowncoder added a commit that referenced this pull request Sep 24, 2015
@cowtowncoder cowtowncoder modified the milestones: 1.9.13, 2.6.3 Sep 24, 2015
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.

3 participants