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
..
bindirbak	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00
conf	Uniting all the READMEs from tools and test	2012-10-12 17:01:20 +05:30
integration	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
metadata	doc: replace virutal by virtual (typo)	2017-12-13 09:59:15 +01:00
scripts	CLOUDSTACK-28 wget.exe (GPLed) is present in the tools directory as a binary	2012-09-24 10:31:47 -04:00
selenium	CLOUDSTACK-6015: add user account, add user, login as new user, delete user, delete user account.	2014-03-28 06:21:59 -04:00
src-not-used/main/java/com/cloud	CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283)	2018-01-20 03:19:27 +05:30
systemvm	CLOUDSTACK-10168: VR duplicate entries in /etc/hosts when reusing VM name (#2366)	2017-12-20 23:19:12 +05:30
pom.xml	Cleanup POMs (#2613)	2018-07-25 14:39:37 -03:00