Merge branch 'master' into swagger_descriptions.

grpc-ecosystem · May 1, 2016 · 8bdac72 · 8bdac72
2 parents 081be28 + 98578bc
commit 8bdac72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -94,5 +94,6 @@ realclean: distclean
 	rm -f $(EXAMPLE_GWSRCS)
 	rm -f $(EXAMPLE_SWAGGERSRCS)
 	rm -f $(GO_PLUGIN)
+	rm -f $(SWAGGER_PLUGIN)
 
 .PHONY: generate examples test clean distclean realclean
diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go
@@ -53,6 +53,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject,
 	for _, msg := range messages {
 		msgDescription := protoComments(reg, msg.File, msg.Outers, "MessageType", int32(msg.Index))
 		object := swaggerSchemaObject{
+			Type:        "object",
 			Properties:  map[string]swaggerSchemaObject{},
 			Description: msgDescription,
 		}