etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors/vmware/src/com/cloud
History
Rohit Yadav a948a89378 Sync updates: Merge branch 'master' into api_refactoring 
Conflicts:
	server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
	server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2013-01-07 10:38:43 -08:00
..
api api: Annotate netscaler apis, remove IdentityMapper from everywhere 2013-01-04 17:09:40 -08:00
ha Patch from Gavin Lee: Change license to ASL2.0 in plugin 2012-08-30 09:17:11 -04:00
hypervisor Missed portion of the fix for CLOUDSTACK-595 submitted by commit 2013-01-07 16:36:47 +05:30
network api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
storage/resource Commit for https://reviews.apache.org/r/7191/ 2012-09-20 15:46:40 -07:00