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
..
bin	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
templates	CLOUDSTACK-9114: Reduce VR downtime during network restart (#2508)	2018-05-11 12:48:07 +05:30
testdata	CLOUDSTACK-10013: SystemVM codebase refactorings and improvements	2017-12-23 09:22:44 +05:30