Merge branch 'master' into java-docs

2016-03-23 20:34:30 +08:00
parent df7c255cd4 327315e9ea
commit 133d9475e5
16 changed files with 164 additions and 11 deletions
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
@@ -123,7 +123,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
     */
    @Override
    public String getName() {
-        return "nodejs";
+        return "nodejs-server";
    }

    /**