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
..
main	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
test	CLOUDSTACK-10365: Change the "getXXX" boolean method names to "isXXX" (#2847)	2018-09-22 17:20:48 +02:00