cloudstack-mirror/server/src/com/cloud/api
Prachi Damle f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
..
doc findbugs: fixes for ApiServer, ApiSerializerHelper and 2014-01-28 14:47:06 +01:00
query Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
response Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
ApiAsyncJobDispatcher.java Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
ApiDBUtils.java Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
ApiDispatcher.java Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
ApiGsonHelper.java Reformatted all of the code. 2013-11-21 06:15:26 -08:00
ApiResponseGsonHelper.java Reformatted all of the code. 2013-11-21 06:15:26 -08:00
ApiResponseHelper.java Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
ApiSerializerHelper.java findbugs: fixes for ApiServer, ApiSerializerHelper and 2014-01-28 14:47:06 +01:00
ApiServer.java Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
ApiServerService.java Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
ApiServlet.java findbugs: fixes for ApiServer, ApiSerializerHelper and 2014-01-28 14:47:06 +01:00
EncodedStringTypeAdapter.java findbugs: fixes for ApiServer, ApiSerializerHelper and 2014-01-28 14:47:06 +01:00
ResponseObjectTypeAdapter.java Reformatted all of the code. 2013-11-21 06:15:26 -08:00
SerializationContext.java Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
StringMapTypeAdapter.java Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00