add DynamicComposites to the list of types supported by SerializerTypeInferer #492

Merged
merged 10 commits into from Jul 11, 2012

Conversation

Projects
None yet
2 participants
Contributor

mebigfatguy commented Jul 11, 2012

No description provided.

Collaborator

zznate commented Jul 11, 2012

Good catch. Thanks. Were the earlier commits from a previous pull request?

@zznate zznate added a commit that referenced this pull request Jul 11, 2012

@zznate zznate Merge pull request #492 from mebigfatguy/master
add DynamicComposites to the list of types supported by SerializerTypeInferer
407b248

@zznate zznate merged commit 407b248 into hector-client:master Jul 11, 2012

@zznate zznate added a commit that referenced this pull request Jul 11, 2012

@zznate zznate Revert "Merge pull request #492 from mebigfatguy/master"
This reverts commit 407b248, reversing
changes made to 3011a08.
094b3b7
Collaborator

zznate commented Jul 11, 2012

Sorry - I had to back this out as it destroyed the merge history. Can you rebase with master and then cherry pick your changes back in? If it's a pain, i'll just hack these in as they are small enough.

Contributor

mebigfatguy commented Jul 12, 2012

i'm happy to do what you like, just not sure what you asking....

should i just blow away my repo, and re-clone and add the changes?

Collaborator

zznate commented Jul 12, 2012

Yeah, I think that's the easiest way to not step on the history. Thanks!

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