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
..
dao	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
MockConfigurationManagerImpl.java	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
MockNetworkManagerImpl.java	CLOUDSTACK-5697 This patchset fixes a bug with the recently merged	2014-01-27 12:11:18 -07:00
MockNetworkModelImpl.java	CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router	2013-12-27 14:27:57 +05:30
MockResourceLimitManagerImpl.java	Merge branch 'master' into rbac.	2014-01-17 14:37:08 -08:00
MockSite2SiteVpnManagerImpl.java	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
MockSite2SiteVpnServiceProvider.java	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
MockVpcVirtualNetworkApplianceManager.java	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00
NetworkACLManagerTest.java	pull merges	2013-12-12 13:00:26 -08:00
NetworkACLServiceTest.java	fix network ACL unit test	2013-12-23 17:27:16 +05:30
Site2SiteVpnTest.java	Removed trailing spaces	2013-11-21 04:08:01 -08:00
VpcApiUnitTest.java	Reformat all source code. Added checkstyle to check the source code	2013-11-20 07:26:53 -08:00
VpcTestConfiguration.java	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00