etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
History
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
..
com/cloud Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
org/apache/cloudstack CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID 2014-01-30 17:35:01 +05:30
resources Removed all reminants of the IdentityService. Created the KeysManager to move the management 2014-01-14 13:11:35 -08:00
async-job-component.xml All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00