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
..
agent	CLOUDSTACK-10215: Excessive log4j debug level in CPVM could lead to FS overflow (#2391)	2018-01-08 13:05:56 +05:30
debian	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
test	Fix Python code checkstyle execute by "systemvm\test\runtests.sh" (#2576)	2018-04-18 13:07:37 -03:00
pom.xml	Cleanup POMs (#2613)	2018-07-25 14:39:37 -03:00
systemvm-agent-descriptor.xml	CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups	2017-12-23 09:22:44 +05:30