xhh 947935f3d9 Merge remote-tracking branch 'origin/develop_2.0' into java-auth ...

Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
	samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java
	samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java

2015-06-05 18:43:49 +08:00

..

src

Merge remote-tracking branch 'origin/develop_2.0' into java-auth

2015-06-05 18:43:49 +08:00

pom.xml

name rebuilds, tests

2015-04-04 17:00:22 -07:00