Rohit Yadav b6302d4e90 Merge remote-tracking branch 'origin/4.11' ... Conflicts resolved for: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java server/src/com/cloud/network/element/VirtualRouterElement.java server/src/com/cloud/vm/UserVmManagerImpl.java tools/marvin/setup.py Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>		2018-10-05 05:18:42 +05:30
..
component	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
plugins	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
smoke	Fix migrate vol xen vmware test (#2755)	2018-08-17 13:32:15 +02:00
testpaths	CLOUDSTACK-8308 automation test for Delta Snapshot	2017-10-10 19:52:49 +02:00
__init__.py	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00