CLOUDSTACK-4371: [Performance Testing] Basic zone with 20K Hosts, management server restart leaves the hosts in disconnected state for very long time
Fixed simulator code to handle local storage during host reconnect
CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path
Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
Removed Epoch tag/number from the cloud.spec to fix the rpm installation of Management Server, Agent and awsapi
Fixed pep8 issues arising as part of merge

Fixed pep8 issues arising as part of merge

Signed-off-by: root <root@localhost.localdomain>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
disable XS event
null pointer dereference fix

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Fix few issues seen in run.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Added fix for CLOUDSTACK-6389

Added changes for CLOUDSTACK-6389.
More details in the bug.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
removed basic zone tag and added advanced zone tag
CLOUDSTACK-6231: network acl item cidrs loaded from a seperate table

Conflicts:
	setup/db/db/schema-430to440.sql
CLOUDSTACK-5674:Fixes for BVT and Regression test failures.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/smoke/test_nic.py
Fixes for BVT and Regression run failures against 4.4 CS
Fix few issues seen in run.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Fixed test data object retrieval
Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
CLOUDSTACK-6549: ommission due to insufficient tests in CLOUDSTACK-6231
- Created new devcloud advanced networking config file (devcloud-advanced_juniper-contrail.cfg). - Modification to deployDataCenter script, to enable "JuniperContrailRouter" & "JuniperContrailVpcRouter" providers.

Signed-off-by: Daan Hoogland <daan@onecht.net>
removed unused command ClusterSyncCommand
kvm: Better handle different volume formats when creating a volume

The KVMStorageProcessor no longer has a hardcoded if-statement which sets
RBD volumes to RAW, this is now handled in the LibvirtStorageAdapter

The Management Server still sends QCOW2 as format. That's a fix for later.