etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test/com/cloud
History
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 		2014-10-16 12:29:37 +02:00
..
alert CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 2013-12-04 10:05:46 -08:00
api server: fix server package after auth plugin refactor 2014-08-28 19:45:23 +02:00
capacity All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
configuration autounboxing fix in ConfigurationManager 2014-04-28 20:56:45 +02:00
event Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
ha test for HighAvailabilityManagerImpl 2014-05-02 21:22:43 +02:00
keystore Reformatted all of the code. 2013-11-21 06:15:26 -08:00
metadata Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
network Applying the latest chances from the VPC Refactor branch onto the new one. 2014-10-14 15:08:13 +02:00
projects Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information" 2014-03-03 12:44:08 -08:00
resource CLOUDSTACK-6366: add vgpuTypes details in vgpu_types table. 2014-04-09 18:23:50 +05:30
resourcelimit Reformatted all of the code. 2013-11-21 06:15:26 -08:00
server CLOUDSTACK-6105: Initial version Windowsfication of the management server 2014-03-24 10:54:46 +05:30
servlet test for escapeHTML 2014-05-02 21:19:49 +02:00
snapshot All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
storage CLOUDSTACK-7699: Disable ROOT volume attach/detach ability. 2014-10-13 13:57:45 -07:00
template Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
user Fix incorrectly written unit tests. 2014-09-02 17:55:44 -07:00
vm CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect 2014-10-14 17:55:37 +05:30
vpc Applying the latest chances from the VPC Refactor branch onto the new one. 2014-10-14 15:08:13 +02:00