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

#514 fixing composed schema parsing #515

Merged
merged 3 commits into from
Sep 11, 2017
Merged

#514 fixing composed schema parsing #515

merged 3 commits into from
Sep 11, 2017

Conversation

phiz71
Copy link
Contributor

@phiz71 phiz71 commented Sep 8, 2017

Fix #514
added a test for each composedSchema

…fixingComposedSchemaParsing

# Conflicts:

#	modules/swagger-parser-v3/src/test/java/io/swagger/parser/v3/util/OpenAPIDeserializerTest.java
@gracekarina
Copy link
Contributor

Thank you! @phiz71

@webron
Copy link
Contributor

webron commented Sep 11, 2017

@phiz71 sorry, should have merged in order. Can you resolve the conflict and then I'll merge?

…fixingComposedSchemaParsing

# Conflicts:

#	modules/swagger-parser-v3/src/main/java/io/swagger/parser/v3/util/OpenAPIDeserializer.java
@phiz71
Copy link
Contributor Author

phiz71 commented Sep 11, 2017

Done

@webron
Copy link
Contributor

webron commented Sep 11, 2017

Thanks, @phiz71!

@webron webron merged commit efd0728 into swagger-api:2.0 Sep 11, 2017
@phiz71 phiz71 deleted the #514-fixingComposedSchemaParsing branch September 15, 2017 19:39
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