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

..

nuagevsp

Fix config drive test for Shared Network

2018-09-17 16:33:36 +02:00

solidfire

Restrict the number of managed clustered file systems per compute cluster (#2500)

2018-09-11 08:23:19 -06:00

test_nicira_controller.py

Use NSX specific config values instead of zone config values

2015-12-24 16:07:06 -03:00

test_quota.py

CLOUDSTACK-9161: fix the quota marvin test

2015-12-16 16:22:31 +05:30