This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    omit 3f818e1  Start services after enabling them using systemd
    omit f95cd05  Ignore files from build of SSVM
    omit 8b829e5  Disable most services by default and enable in 
cloud-early-config
    omit 319247d  Accept DOS/MBR as file format for ISO images as well
    omit 0f4079f  Move systemd services to /etc and enable services after they 
have been installed
    omit c49c352  Load the nf_conntrack_ipv6 module for IPv6 connection 
tracking on SSVM
    omit c712fc2  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
     add b947eca  CLOUDSTACK-9734: Destroy VM Fails sometimes (#2013)
     add 0c6cf69  CLOUDSTACK-9717: [VMware] RVRs have mismatching MAC addresses 
for extra public NICs. (#1878)
     add 40d7746  CLOUDSTACK-9967: Fixed static nat iptables rules order issue 
on additional public subnet ip (#2154)
     add deb92d3  CLOUDSTACK-10030: Make sure that public IPs assigned to VPC 
are reacheable from inside the VPC (#2221)
     add f62a8d7  CLOUDSTACK-10022: Allow domain admin to create and delete 
subdomains (#2222)
     add 310195c  CLOUDSTACK-10052: Simplify dynamic roles enable checking 
(#2241)
     add 0f27bc9  Merge branch '4.9' into 4.10
     add cc749cc  Merge branch '4.10'
     add 7f987ac  CLOUDSTACK-9165: unable to use reserved IP range in a network 
for external VMs (#1246)
     add 1f29313  CLOUDSTACK-10002: Restart network with cleanup spawns 
Redundant Routers(In Default Network Offering) (#2186)
     add 57255ac  CLOUDSTACK-9914: Update Quota plugin to support currency 
values up to 5 decimal places (#2123)
     add 4b38d36  CLOUDSTACK-9915  ListSnapshots API does not provide virtual 
size information of the snapshots (#2101)
     add a8c09f2  CLOUDSTACK-9996: Fix juniper vlan untagged jedgement and xml 
element replacment (#2174)
     add 4268944  CE-110 move config to public fields
     add 693d63e  CE-110 remove duplicate-unused functionality
     add c10c342  CE-110 task for marking cleaning fully cloned templates   
implemented by marking them for GC
     add 16b34c9  CE-110 default interval of 0 minutes means do not mark for 
cleaning
     add 94718c0  CE-110 markedForGC is ignored so delete the templates in the 
task that finds them
     add 64e56a2  Merge pull request #2044 from 
shapeblue/cleanup-unlinked-templates
     add 7ce54bf  CLOUDSTACK-9993: Securing Agents Communications (#2239)
     add a444077  docker: increased jetty timeout (#2245)
     add 8502a66  CLOUDSTACK-10027: Repeating the same list for Internal LB in 
VPC (#2216)
     add 3fc696e  CLOUDSTACK-9954 Unable to create service offering with 
networkrate=0
     add 31f27da  Merge branch 'master' of https://github.com/apache/cloudstack
     add f66bbb9  CLOUDSTACK-9922 Unable to use 8081 port for Load balancing
     add 6e832b5  Merge pull request #2109 from Accelerite/CLOUDSTACK-9922
     add 212e5cc  CLOUDSTACK-9782: Host HA and KVM HA provider
     add c0b33db  CLOUDSTACK-9782: Nested-oobm CloudStack plugin
     add d2c3408  CLOUDSTACK-9782: Improve scheduling of jobs
     add f917ab6  CLOUDSTACK-9782: Improve host HA tests
     add 01b040d  CLOUDSTACK-9314: Remove unused code from 
XenServerStorageProcessor (#1443)
     add bf35aef  CLOUDSTACK-10032 : Database entries for templates created 
from snapshots disappear after management-server service restart (#2224)
     add d1e61eb  CLOUDSTACK-9812: Update 'updatePortForwardingRule' api to 
include additional parameter end port (#1985)
     add dfd01c99 CLOUDSTACK-10059: Dashboard ignores resource value that is 
less than 1%
     add 0d81e88  CLOUDSTACK-8939: VM Snapshot size with memory correctly 
calculated in cloud.usage_event (XenServer) (#914)
     add 74fe9e3  CLOUDSTACK-10004 : On deletion, Vmware volume snapshots are 
left behind with message 'the snapshot has child, can't delete it on the 
storage' (#2188)
     add 4dd8b5d  CLOUDSTACK-9563: ExtractTemplate returns malformed URL after 
migrating NFS to s3 (#1733)
     add a52ce36  CLOUDSTACK-10058: Error while opening the Settings tab in 
Secondary storage (#2254)
     add f5cebeb  CLOUDSTACK-10061: When starting a VM, make sure it is 
attached to correct VAG when using managed storage (#2253)
     add 6f157cc  CLOUDSTACK-9782: Fix intermittent host-ha KVM test failures 
(#2256)
     add d145944  Updating pom.xml version numbers for release 4.9.3.0
     add 774998d  Updating pom.xml version numbers for release 4.9.4.0-SNAPSHOT
     add 854d9e0  Merge branch '4.9' into 4.10
     add f2cb218  Merge branch '4.10'
     add 85e57d1  CLOUDSTACK-10069: Add sha512 suffix to SHA 512 checksum 
(#2262)
     add a90b600  Merge branch '4.9' into 4.10
     add a6b41c1  Merge branch '4.10'
     add 48fa206  CLOUDSTACK-9963 Root Disk controller value is changing while 
migrating VM
     add c4ca420  CLOUDSTACK-8969: VPN customer gateway can't be registered 
with hostname (#955)
     add e894022  CLOUDSTACK-9886 : After restarting cloudstack-management , It 
takes time to connect hosts
     add b655f9b  Merge pull request #2054 from Accelerite/cs-51009
     add d84585f  CLOUDSTACK-10068: Fixing test_iso.py assertions are equating 
srt and bool instead of the same types (#2261)
     add c7a55eb  CLOUDSTACK-10019: template.properties has hardcoded id (#2243)
     add 2ccea13  CLOUDSTACK-10056: Fix vm details usage (#2248)
     add 2bad9a6  CLOUDSTACK-9949: add ability to specify mac address (#2143)
     add a4036f7  CLOUDSTACK-10067: Fix a case where a user 'ro' or 'roo' 
exists on the system, or other variants. (#2252)
     add 3bc2341  CLOUDSTACK-9902: add consoleproxy.sslEnable global setting 
(#2078)
     add 3f69c83  CLOUDSTACK-9956: File search on the vmware datastore may 
select wrong file if there are multiple files with same name (#2153)
     add f2584bb  CLOUDSTACK-9182: Some running VMs turned off on manual 
migration when auto migration failed while host preparing for maintenance. 
(#1252)
     add c670691  CLOUDSTACK-8865: Adding SR doesn't create 
Storage_pool_host_ref entry for disabled host (#876)
     add e1cff7d  CLOUDSTACK-10083: Allow ModifySshKeys to be forwarded to the 
agent in maintenance mode (#2269)
     add b130e55  CLOUDSTACK-9397: Add Watchdog timer to KVM Instance (#1707)
     add a06530d  CLOUDSTACK-10007 Isolation method claim (#2249)
     add 3381c38  CLOUDSTACK-10073: KVM host RAM overprovisioning (#2266)
     add 19706b9  CLOUDSTACK-10099: Fix migrateVirtualMachineWithVolume UI 
failure (#2277)
     add 74ec9ce  CLOUDSTACK-9584: Re-arrange failing project_limits test 
(#2279)
     add 0dfdbe0  CLOUDSTACK-9993: With auth strictness stop SSL handshake for 
rogue clients (#2278)
     add b044f1b  CLOUDSTACK-9859: Retirement of midonet plugin (final removal) 
(#2285)
     add f1c01a5  CLOUDSTACK-10101: Present the full domain name when listing 
user's domains in SAML2 plugin (#2280)
     add 5636c9b  CLOUDSTACK-8308 automation test for Delta Snapshot
     add 7ca5b53  CLOUDSTACK-9899 Url validation disabling (#2074)
     add ed7811a  CLOUDSTACK-10046 checksum validation for any java supported 
Digests-type (#2246)
     add 0fedbdd  CLOUDSTACK-9998: Prometheus Exporter for CloudStack (#2287)
     add c3ed1b3  CLOUDSTACK-9993: Have basic constraint in CA certificate 
(#2286)
     add 189b0e4  CLOUDSTACK-10060: ListUsage API always displays the Virtual 
size as '0' for Usage type=9 (snapshot) (#2257)
     add a379230  CLOUDSTACK-9957 Annotations (#2181)
     add 3985c68  CLOUDSTACK-10007 no isolationmethod check for directpodbase 
basic zone nets (#2296)
     add 6bb0ca2  This feature separates the snapshot creation on primary and 
its backing up on secondary. As part of this, a new parameter, which is 
optional, is added to CreateSnapshotCmd, which seperates the creation and 
backup.
     add 4c89b5b  Merge branch 'pr-2081'
     add 285fd77  CLOUDSTACK-9957 test fix (#2297)
     add bd953d8  CLOUDSTACK-10107: For VMware VMs add devices without unit 
number (#2288)
     add b6dc40f  CLOUDSTACK-10103: Cloudian Connector for CloudStack (#2284)
     add 382d458  CLOUDSTACK-10113 password resets only one at the time
     add 4f6b91d  Merge release branch 4.9 to 4.10
     add 4d19373  Merge release branch 4.10 to master
     add 41fdb88  CLOUDSTACK-10047: DVSwitch fixes and improvements (#2293)
     add 9c7cd8c  CLOUDSTACK-10081: CloudUtils getDevInfo function will now 
return "bridge" instead of "dev" when the name of a ovs bridge is passed.
     add ca13048  Merge pull request #2268 from 
nuagenetworks/bugfix/CLOUDSTACK-10081
     add 587b66d  CLOUDSTACK-10057: listNetworkOfferings now returns the 
correct number of offerings (#2250)
     add 0871ff9  CLOUDSTACK-10053: Performance improvement: caching of 
NuageVsp ID
     add 2139dbe  Merge pull request #2238 from 
nuagenetworks/feature/caching_and_statistics
     add 1d382e0  CLOUDSTACK-9832: Remove public interface from VPC Virtual 
Router
     add d077b3e  Merge pull request #2004 from 
nuagenetworks/feature/vr_without_public_ip
     add 1d36b72  CLOUDSTACK-10120 : Allow migration of VM's from Cloudstack UI 
between the hosts with different version
     add a50a461  CLOUDSTACK-10085 : Upload volume from local fails when global 
config max.account.seconday.storage is set to -1
     add 1315c94  CLOUDSTACK-10122: Unrelated error message (#2302)
     add c6b808f  CLOUDSTACK-10111: Fix validation for parameter 
"vm.password.length" (#2291)
     add e9f29c7  CLOUDSTACK-10012: Introduce Embedded Jetty with shaded jar
     add eda3b35  CLOUDSTACK-10012: Migrate to Embedded Jetty
     new ea95fa2  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
     new bcb2f5e  Load the nf_conntrack_ipv6 module for IPv6 connection 
tracking on SSVM
     new d6896b7  Move systemd services to /etc and enable services after they 
have been installed
     new 1305744  Accept DOS/MBR as file format for ISO images as well
     new 790dcb6  Disable most services by default and enable in 
cloud-early-config
     new b2db1d9  Ignore files from build of SSVM
     new a9f0db7  Start services after enabling them using systemd

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3f818e1)
            \
             N -- N -- N   refs/heads/debian9-systemvmtemplate (a9f0db7)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |   22 +-
 INSTALL.md                                         |    4 +-
 README.md                                          |    2 +-
 agent/conf/agent.properties                        |   18 +-
 agent/src/com/cloud/agent/Agent.java               |  127 +-
 agent/src/com/cloud/agent/AgentShell.java          |   13 +-
 .../cloud/agent/dao/impl/PropertiesStorage.java    |   29 +-
 .../consoleproxy/ConsoleProxyResource.java         |   12 +-
 agent/test/com/cloud/agent/AgentShellTest.java     |   15 +
 api/pom.xml                                        |    5 +
 api/src/com/cloud/agent/api/to/NicTO.java          |   12 +
 api/src/com/cloud/dc/DataCenter.java               |    5 +-
 api/src/com/cloud/event/EventTypes.java            |   32 +-
 api/src/com/cloud/host/Host.java                   |   14 +-
 api/src/com/cloud/host/Status.java                 |    2 +
 api/src/com/cloud/network/Network.java             |   14 +
 api/src/com/cloud/network/NetworkModel.java        |    5 +-
 api/src/com/cloud/network/Networks.java            |    4 +
 api/src/com/cloud/network/rules/RulesService.java  |    2 +-
 api/src/com/cloud/offering/NetworkOffering.java    |    2 +-
 api/src/com/cloud/org/Cluster.java                 |    6 +-
 api/src/com/cloud/resource/ResourceState.java      |    3 +
 api/src/com/cloud/storage/ImageStore.java          |    7 +
 api/src/com/cloud/storage/Snapshot.java            |    2 +
 api/src/com/cloud/storage/VolumeApiService.java    |    2 +-
 api/src/com/cloud/vm/NicProfile.java               |    5 +
 api/src/com/cloud/vm/VirtualMachine.java           |   18 +-
 api/src/com/cloud/vm/VmDetailConstants.java        |    3 +
 .../org/apache/cloudstack/alert/AlertService.java  |    8 +-
 .../apache/cloudstack/annotation/Annotation.java}  |   31 +-
 .../cloudstack/annotation/AnnotationService.java   |   49 +
 api/src/org/apache/cloudstack/api/APICommand.java  |    5 +-
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |    8 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   26 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |   53 +-
 .../command/admin/annotation/AddAnnotationCmd.java |   86 +
 .../admin/annotation/ListAnnotationsCmd.java       |   81 +
 .../admin/annotation/RemoveAnnotationCmd.java      |   64 +
 .../api/command/admin/ca/IssueCertificateCmd.java  |  162 ++
 .../api/command/admin/ca/ListCAProvidersCmd.java   |  102 ++
 .../api/command/admin/ca/ListCaCertificateCmd.java |   90 ++
 .../command/admin/ca/ProvisionCertificateCmd.java  |  125 ++
 .../api/command/admin/ca/RevokeCertificateCmd.java |  116 ++
 .../api/command/admin/domain/CreateDomainCmd.java  |   11 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |   11 +-
 .../command/admin/ha/ConfigureHAForHostCmd.java    |  127 ++
 .../command/admin/ha/DisableHAForClusterCmd.java   |  114 ++
 .../api/command/admin/ha/DisableHAForHostCmd.java  |  116 ++
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |  115 ++
 .../command/admin/ha/EnableHAForClusterCmd.java    |  114 ++
 .../api/command/admin/ha/EnableHAForHostCmd.java   |  116 ++
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |  115 ++
 .../command/admin/ha/ListHostHAProvidersCmd.java   |  106 ++
 .../command/admin/ha/ListHostHAResourcesCmd.java   |  109 ++
 .../api/command/admin/host/UpdateHostCmd.java      |   22 +-
 .../admin/network/CreateNetworkCmdByAdmin.java     |   10 +
 .../admin/network/CreateNetworkOfferingCmd.java    |    3 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |   12 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |    2 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |   13 +-
 .../command/user/template/RegisterTemplateCmd.java |    2 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |   17 +
 .../api/command/user/vm/DeployVMCmd.java           |   29 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |    2 +-
 .../api/response/AnnotationResponse.java           |  121 ++
 .../api/response/CAProviderResponse.java           |   52 +
 .../api/response/CertificateResponse.java          |   58 +
 .../api/response/HAProviderResponse.java           |   58 +
 .../cloudstack/api/response/HostHAResponse.java    |  104 ++
 .../cloudstack/api/response/HostResponse.java      |   36 +
 .../api/response/OutOfBandManagementResponse.java  |    2 +-
 .../cloudstack/api/response/SnapshotResponse.java  |    8 +
 api/src/org/apache/cloudstack/ca/CAManager.java    |  163 ++
 api/src/org/apache/cloudstack/ha/HAConfig.java     |  146 ++
 .../org/apache/cloudstack/ha/HAConfigManager.java  |   96 ++
 .../BackgroundPollTask.java => ha/HAResource.java} |   20 +-
 .../Partition.java}                                |   11 +-
 .../outofbandmanagement/OutOfBandManagement.java   |    4 +-
 .../apache/cloudstack/poll/BackgroundPollTask.java |    6 +
 api/test/com/cloud/network/NetworksTest.java       |   19 +-
 .../admin/annotation/AddAnnotationCmdTest.java     |   25 +-
 .../api/command/test/CreateSnapshotCmdTest.java    |    4 +-
 build/replace.properties                           |    2 +-
 client/WEB-INF/web.xml                             |   51 +-
 client/bindir/cloud-setup-management.in            |    4 +-
 .../commons-logging.properties.in                  |    4 +-
 client/{tomcatconf => conf}/db.properties.in       |    7 +-
 client/{tomcatconf => conf}/ehcache.xml.in         |   26 +-
 .../{tomcatconf => conf}/environment.properties.in |    4 +-
 .../{tomcatconf => conf}/java.security.ciphers.in  |    0
 client/{tomcatconf => conf}/log4j-cloud.xml.in     |   16 +-
 .../script.sh => client/conf/server.properties.in  |   34 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |  107 --
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   23 -
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |  106 --
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   23 -
 .../opensuse/SYSCONFDIR/init.d/cloud-management.in |  239 ---
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   23 -
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |  108 --
 .../rhel/SYSCONFDIR/sysconfig/cloud-management.in  |   23 -
 .../sles/SYSCONFDIR/init.d/cloud-management.in     |  239 ---
 .../sles/SYSCONFDIR/sysconfig/cloud-management.in  |   23 -
 .../ubuntu/SYSCONFDIR/init.d/cloud-management.in   |  244 ---
 client/pom.xml                                     |  243 ++-
 client/src/org/apache/cloudstack/ServerDaemon.java |  310 ++++
 client/tomcatconf/catalina.policy.in               |  180 ---
 client/tomcatconf/catalina.properties.in           |   81 -
 client/tomcatconf/classpath.conf.in                |   41 -
 client/tomcatconf/cloudmanagementserver.keystore   |  Bin 1316 -> 0 bytes
 client/tomcatconf/context.xml.in                   |   35 -
 client/tomcatconf/logging.properties.in            |   64 -
 client/tomcatconf/server-nonssl.xml.in             |  149 --
 client/tomcatconf/server-ssl.xml.in                |  157 --
 client/tomcatconf/server7-nonssl.xml.in            |  149 --
 client/tomcatconf/server7-ssl.xml.in               |  157 --
 client/tomcatconf/tomcat-users.xml.in              |   31 -
 client/tomcatconf/tomcat6-nonssl.conf.in           |   73 -
 client/tomcatconf/tomcat6-ssl.conf.in              |   72 -
 client/tomcatconf/web.xml.in                       | 1187 --------------
 core/pom.xml                                       |    2 +-
 .../META-INF/cloudstack/ca/module.properties       |    5 +-
 ...ring-core-lifecycle-ca-context-inheritable.xml} |   23 +-
 ...-core-lifecycle-compute-context-inheritable.xml |    5 +
 .../core/spring-core-registry-core-context.xml     |   11 +-
 .../api/CheckVMActivityOnStoragePoolCommand.java   |   70 +
 .../cloud/agent/api/ComputeChecksumCommand.java    |   14 +-
 .../agent/api/routing/NetworkElementCommand.java   |   13 +
 .../virtualnetwork/VirtualRoutingResource.java     |   44 +
 .../storage/template/HttpTemplateDownloader.java   |  424 +++--
 .../cloudstack/ca/SetupCertificateAnswer.java      |   12 +-
 .../cloudstack/ca/SetupCertificateCommand.java     |   99 ++
 .../apache/cloudstack/ca/SetupKeyStoreCommand.java |   75 +
 .../apache/cloudstack/ca/SetupKeystoreAnswer.java  |   20 +-
 .../api/agent/test/CheckOnHostCommandTest.java     |   19 +-
 debian/cloudstack-agent.postinst                   |    0
 debian/cloudstack-management.install               |   17 +-
 debian/cloudstack-management.postinst              |   26 +-
 .../cloudstack-management.preinst                  |   14 +-
 debian/cloudstack-marvin.postinst                  |    0
 debian/cloudstack-usage.postinst                   |    0
 debian/control                                     |    7 +-
 debian/rules                                       |   23 +-
 developer/developer-prefill.sql                    |    5 +
 engine/api/pom.xml                                 |   15 -
 .../service/NetworkOrchestrationService.java       |   22 +-
 .../engine/subsystem/api/storage/SnapshotInfo.java |    4 +
 .../subsystem/api/storage/SnapshotService.java     |    6 +
 .../subsystem/api/storage/SnapshotStrategy.java    |    3 +
 .../src/com/cloud/agent/AgentManager.java          |    2 +
 .../cloud/configuration/ConfigurationManager.java  |    2 +-
 .../src/com/cloud/network/vpc/VpcManager.java      |    7 +
 .../src/com/cloud/resource/ResourceManager.java    |    2 +
 .../src/com/cloud/storage/StorageManager.java      |    2 +
 .../src/com/cloud/template/TemplateManager.java    |    2 +-
 .../src/com/cloud/vm/VmWorkTakeVolumeSnapshot.java |    8 +-
 .../src/com/cloud/agent/manager/AgentAttache.java  |    3 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    6 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   28 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   57 +-
 .../datacenter/entity/api/db/EngineClusterVO.java  |   31 +-
 .../entity/api/db/EngineDataCenterVO.java          |   29 +-
 .../datacenter/entity/api/db/EngineHostVO.java     |   45 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   79 +-
 .../engine/orchestration/VolumeOrchestrator.java   |   41 +-
 .../spring-engine-schema-core-daos-context.xml     |    5 +-
 engine/schema/src/com/cloud/certificate/CrlVO.java |   85 +
 .../src/com/cloud/certificate/dao/CrlDao.java      |   13 +-
 .../src/com/cloud/certificate/dao/CrlDaoImpl.java  |   57 +
 engine/schema/src/com/cloud/dc/ClusterVO.java      |   22 +-
 engine/schema/src/com/cloud/dc/DataCenterVO.java   |   20 +-
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java    |    4 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |   45 +-
 engine/schema/src/com/cloud/host/HostVO.java       |   38 +-
 engine/schema/src/com/cloud/host/dao/HostDao.java  |    2 +
 .../schema/src/com/cloud/host/dao/HostDaoImpl.java |   21 +-
 .../src/com/cloud/network/dao/NetworkDao.java      |    4 +-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |   54 +-
 .../src/com/cloud/network/dao/NetworkVO.java       |   17 +-
 .../schema/src/com/cloud/storage/SnapshotVO.java   |    5 +
 .../src/com/cloud/upgrade/dao/Upgrade481to490.java |   45 +-
 engine/schema/src/com/cloud/vm/VMInstanceVO.java   |   33 +-
 engine/schema/src/com/cloud/vm/dao/NicDao.java     |    4 +
 engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java |   29 +
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java    |    2 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |   14 +-
 .../schema/src/com/cloud/vm/dao/VMInstanceDao.java |    2 +
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java    |   15 +
 .../apache/cloudstack/annotation/AnnotationVO.java |  154 ++
 .../cloudstack/annotation/dao/AnnotationDao.java   |   13 +-
 .../annotation/dao/AnnotationDaoImpl.java          |   59 +
 .../engine/cloud/entity/api/db/VMEntityVO.java     |    5 +
 .../HAConfigVO.java}                               |  127 +-
 .../org/apache/cloudstack/ha/dao/HAConfigDao.java} |   33 +-
 .../apache/cloudstack/ha/dao/HAConfigDaoImpl.java  |  149 ++
 .../outofbandmanagement/OutOfBandManagementVO.java |    6 +-
 engine/schema/test/resources/db.properties         |    2 +-
 engine/service/src/main/webapp/WEB-INF/log4j.xml   |   14 +-
 engine/service/src/main/webapp/WEB-INF/web.xml     |    3 -
 .../storage/motion/AncientDataMotionStrategy.java  |    6 +-
 .../storage/image/store/ImageStoreImpl.java        |    5 +
 .../test/resource/fakeDriverTestContext.xml        |    1 -
 .../test/resources/storageContext.xml              |    1 -
 .../storage/snapshot/SnapshotBackupException.java} |   16 +-
 .../storage/snapshot/SnapshotObject.java           |   16 +
 .../storage/snapshot/SnapshotServiceImpl.java      |   70 +-
 .../snapshot/SnapshotStateMachineManagerImpl.java  |    1 +
 .../snapshot/StorageSystemSnapshotStrategy.java    |   32 +-
 .../snapshot/XenserverSnapshotStrategy.java        |  102 +-
 .../storage/snapshot/test/resources/db.properties  |    2 +-
 .../storage/image/db/SnapshotDataStoreDaoImpl.java |   68 +-
 .../storage/snapshot/SnapshotEntityImpl.java       |    6 +
 .../volume/db/TemplatePrimaryDataStoreDaoImpl.java |  123 --
 .../volume/db/TemplatePrimaryDataStoreVO.java      |  262 ----
 .../globodns => framework/ca}/pom.xml              |   18 +-
 .../apache/cloudstack/framework/ca/CAProvider.java |  107 ++
 .../apache/cloudstack/framework/ca/CAService.java  |   50 +
 .../cloudstack/framework/ca/Certificate.java       |   40 +-
 .../cloudstack/framework/config/ConfigKey.java     |    3 +-
 .../apache/cloudstack/framework/jobs/AsyncJob.java |    2 +
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |   22 +
 framework/pom.xml                                  |    1 +
 packaging/centos63/cloud-management.rc             |  197 ++-
 packaging/centos63/cloud-management.sysconfig      |   23 -
 packaging/centos63/cloud.spec                      |  130 +-
 packaging/centos7/cloud.spec                       |   80 +-
 packaging/centos7/tomcat7/catalina.properties      |   81 -
 .../centos7/tomcat7/commons-logging.properties     |   30 -
 packaging/centos7/tomcat7/db.properties            |  106 --
 packaging/centos7/tomcat7/environment.properties   |   22 -
 packaging/centos7/tomcat7/java.security.ciphers    |   18 -
 packaging/centos7/tomcat7/log4j-cloud.xml          |  199 ---
 packaging/centos7/tomcat7/server.xml               |   80 -
 packaging/centos7/tomcat7/tomcat-users.xml         |   31 -
 packaging/centos7/tomcat7/web.xml                  | 1187 --------------
 packaging/debian/init/cloud-management             |  153 +-
 packaging/debian/replace.properties                |    2 +-
 packaging/fedora20/cloud-agent.rc                  |  118 --
 packaging/fedora20/cloud-ipallocator.rc            |   96 --
 packaging/fedora20/cloud-management.rc             |  115 --
 packaging/fedora20/cloud-management.sysconfig      |   23 -
 packaging/fedora20/cloud-usage.rc                  |  156 --
 packaging/fedora20/cloud.spec                      |  655 --------
 packaging/fedora20/cloudstack-agent.te             |   33 -
 packaging/fedora20/cloudstack-sccs                 |   20 -
 packaging/fedora20/replace.properties              |   59 -
 packaging/fedora21/cloud-agent.rc                  |  118 --
 packaging/fedora21/cloud-ipallocator.rc            |   96 --
 packaging/fedora21/cloud-management.rc             |  115 --
 packaging/fedora21/cloud-management.sysconfig      |   23 -
 packaging/fedora21/cloud-usage.rc                  |  156 --
 packaging/fedora21/cloud.spec                      |  655 --------
 packaging/fedora21/cloudstack-agent.te             |   33 -
 packaging/fedora21/replace.properties              |   59 -
 packaging/systemd/cloudstack-management.default    |   34 +-
 .../systemd/cloudstack-management.default.ubuntu   |   50 -
 packaging/systemd/cloudstack-management.service    |   16 +-
 .../systemd/cloudstack-management.service.ubuntu   |   40 -
 .../midonet => ca/root-ca}/pom.xml                 |   32 +-
 .../META-INF/cloudstack/root-ca/module.properties  |    4 +-
 .../cloudstack/root-ca/spring-root-ca-context.xml} |   18 +-
 .../ca/provider/RootCACustomTrustManager.java      |  146 ++
 .../cloudstack/ca/provider/RootCAProvider.java     |  413 +++++
 .../ca/provider/RootCACustomTrustManagerTest.java  |  110 ++
 .../cloudstack/ca/provider/RootCAProviderTest.java |  155 ++
 plugins/event-bus/kafka/pom.xml                    |    2 +-
 plugins/event-bus/rabbitmq/pom.xml                 |    2 +-
 .../kvm-compute/spring-kvm-compute-context.xml     |    7 +
 .../kvm/src/com/cloud/ha/KVMInvestigator.java      |   21 +-
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |    5 +
 .../hypervisor/kvm/resource/KVMHAChecker.java      |   10 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   24 +-
 .../kvm/resource/KVMHAVMActivityChecker.java       |   70 +
 .../kvm/resource/LibvirtComputingResource.java     |   38 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |   29 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   61 +
 .../wrapper/LibvirtCheckOnHostCommandWrapper.java  |    6 +-
 ...CheckVMActivityOnStoragePoolCommandWrapper.java |   65 +
 .../org/apache/cloudstack/kvm/ha/KVMHAConfig.java  |   56 +
 .../apache/cloudstack/kvm/ha/KVMHAProvider.java    |  157 ++
 .../cloudstack/kvm/ha/KVMHostActivityChecker.java  |  205 +++
 .../kvm/resource/LibvirtComputingResourceTest.java |    3 +
 .../kvm/resource/LibvirtDomainXMLParserTest.java   |    6 +
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |    9 +
 .../apache/cloudstack/kvm/ha/KVMHostHATest.java    |   84 +
 plugins/hypervisors/ovm3/pom.xml                   |    5 -
 plugins/hypervisors/simulator/pom.xml              |    5 +
 .../spring-simulator-compute-context.xml           |    4 +
 .../com/cloud/agent/manager/MockAgentManager.java  |    7 +
 .../cloud/agent/manager/MockAgentManagerImpl.java  |   24 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |   10 +
 .../ConfigureSimulatorHAProviderState.java         |  120 ++
 .../commands/ListSimulatorHAStateTransitions.java  |  104 ++
 .../api/response/SimulatorHAStateResponse.java     |   65 +
 .../src/com/cloud/ha/SimulatorInvestigator.java    |   10 +
 .../apache/cloudstack/ha/SimulatorHAProvider.java  |  160 ++
 .../org/apache/cloudstack/ha/SimulatorHAState.java |   89 ++
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   18 +
 .../manager/CleanupFullyClonedTemplatesTask.java   |  158 ++
 .../hypervisor/vmware/manager/VmwareManager.java   |   22 +-
 .../vmware/manager/VmwareManagerImpl.java          |  190 ++-
 .../vmware/manager/VmwareStorageManagerImpl.java   |   11 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  113 +-
 .../resource/VmwareStorageLayoutHelper.java        |   35 +-
 .../storage/resource/VmwareStorageProcessor.java   |   23 +-
 .../vmware/VmwareDatacenterApiUnitTest.java        |  115 +-
 .../vmware/resource/VmwareResourceTest.java        |   34 +
 .../xenserver/resource/CitrixResourceBase.java     |   42 +-
 .../resource/XenServerStorageProcessor.java        |  183 +--
 .../CitrixCreateVMSnapshotCommandWrapper.java      |    8 +-
 .../CitrixDeleteVMSnapshotCommandWrapper.java      |    9 +-
 {api => plugins/integrations/cloudian}/pom.xml     |   54 +-
 .../META-INF/cloudstack/cloudian/module.properties |    4 +-
 .../cloudian/spring-cloudian-context.xml}          |   13 +-
 .../cloudstack/cloudian/CloudianConnector.java     |   82 +
 .../cloudstack/cloudian/CloudianConnectorImpl.java |  345 +++++
 .../cloudian/api/CloudianIsEnabledCmd.java         |   65 +
 .../cloudian/api/CloudianSsoLoginCmd.java          |   70 +
 .../cloudstack/cloudian/client/CloudianClient.java |  347 +++++
 .../cloudstack/cloudian/client/CloudianGroup.java  |   44 +-
 .../cloudstack/cloudian/client/CloudianUser.java   |   85 +
 .../cloudstack/cloudian/client/CloudianUtils.java  |   92 ++
 .../cloudian/response/CloudianEnabledResponse.java |   40 +-
 .../response/CloudianSsoLoginResponse.java         |   25 +-
 .../cloudstack/cloudian/CloudianClientTest.java    |  416 +++++
 .../rabbitmq => integrations/prometheus}/pom.xml   |   25 +-
 .../cloudstack/prometheus}/module.properties       |    4 +-
 .../prometheus/spring-prometheus-context.xml}      |   15 +-
 .../cloudstack/metrics/PrometheusExporter.java     |    7 +-
 .../cloudstack/metrics/PrometheusExporterImpl.java |  612 ++++++++
 .../metrics/PrometheusExporterServer.java          |   33 +
 .../metrics/PrometheusExporterServerImpl.java      |  118 ++
 plugins/network-elements/globodns/pom.xml          |    2 +-
 .../globodns/test/resources/db.properties          |    2 +-
 .../element/InternalLoadBalancerElement.java       |    8 +-
 .../ElementChildTestConfiguration.java             |    6 +
 plugins/network-elements/juniper-contrail/pom.xml  |    6 +
 .../cloud/network/resource/JuniperSrxResource.java |    4 +-
 .../com/cloud/network/element/MidoNetElement.java  | 1635 --------------------
 .../cloud/network/element/SimpleFirewallRule.java  |  219 ---
 .../network/guru/MidoNetGuestNetworkGuru.java      |  160 --
 .../network/guru/MidoNetPublicNetworkGuru.java     |  252 ---
 .../cloud/network/resource/MidoNetVifDriver.java   |  169 --
 .../cloud/network/element/MidoNetElementTest.java  |  199 ---
 plugins/network-elements/nuage-vsp/pom.xml         |    2 +-
 .../api/manager/ImplementNetworkVspAnswer.java     |   33 +-
 .../com/cloud/network/element/NuageVspElement.java |   18 +-
 .../network/guru/NuageVspGuestNetworkGuru.java     |  106 +-
 .../cloud/network/manager/AbstractListener.java    |   91 ++
 .../com/cloud/network/manager/NuageVspManager.java |   28 +-
 .../cloud/network/manager/NuageVspManagerImpl.java |  339 ++--
 .../cloud/network/resource/NuageVspResource.java   |   86 +-
 .../resource/NuageVspResourceConfiguration.java    |    5 +-
 .../cloud/network/resource/VspStatisticsMBean.java |   66 +
 .../network/resource/VspStatisticsMBeanImpl.java   |   66 +
 ...NuageVspGuruImplementNetworkCommandWrapper.java |   25 +-
 .../src/com/cloud/util/NuageVspEntityBuilder.java  |  248 +--
 .../nuage-vsp/test/com/cloud/NuageTest.java        |   11 +
 .../network/guru/NuageVspGuestNetworkGuruTest.java |    4 +
 .../network/resource/NuageVspResourceTest.java     |    3 +-
 .../com/cloud/util/NuageVspEntityBuilderTest.java  |   72 +-
 .../nested-cloudstack}/pom.xml                     |   25 +-
 .../nested-cloudstack}/module.properties           |    4 +-
 .../spring-nested-cloudstack-context.xml}          |   15 +-
 .../NestedCloudStackOutOfBandManagementDriver.java |  147 ++
 ...tedCloudStackOutOfBandManagementDriverTest.java |   75 +
 plugins/pom.xml                                    |   10 +-
 .../ElastistorPrimaryDataStoreLifeCycle.java       |    2 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |    2 +-
 ...loudStackPrimaryDataStoreLifeCycleImplTest.java |  170 ++
 .../SolidFireSharedPrimaryDataStoreLifeCycle.java  |    2 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |    1 +
 .../api/response/SamlUserAccountResponse.java      |   13 +
 .../cloudstack/saml/SAML2AuthManagerImpl.java      |   99 +-
 .../src/org/apache/cloudstack/saml/SAMLUtils.java  |  158 +-
 .../GetServiceProviderMetaDataCmdTest.java         |   30 +-
 .../test/org/apache/cloudstack/SAMLUtilsTest.java  |   20 +-
 .../command/SAML2LoginAPIAuthenticatorCmdTest.java |   35 +-
 .../SAML2LogoutAPIAuthenticatorCmdTest.java        |   19 +-
 pom.xml                                            |  105 +-
 .../bindir/cloud-grab-dependent-library-versions   |    2 +-
 python/lib/cloudutils/globalEnv.py                 |    2 -
 python/lib/cloudutils/networkConfig.py             |    2 +-
 python/lib/cloudutils/serviceConfigServer.py       |   81 +-
 scripts/common/keys/ssl-keys.py                    |   58 -
 scripts/installer/createtmplt.sh                   |    1 +
 scripts/installer/createvolume.sh                  |    1 +
 scripts/installer/windows/acs.wxs                  |    3 -
 scripts/installer/windows/client.wxs               |    9 -
 scripts/network/domr/router_proxy.sh               |   10 +-
 scripts/storage/qcow2/createtmplt.sh               |   24 +-
 scripts/storage/qcow2/createvolume.sh              |   24 +-
 scripts/storage/secondary/createtmplt.sh           |   34 +-
 scripts/storage/secondary/createvolume.sh          |    1 +
 scripts/util/keystore-cert-import                  |  100 ++
 scripts/util/keystore-setup                        |   51 +
 scripts/vm/hypervisor/kvm/kvmvmactivity.sh         |  135 ++
 server/pom.xml                                     |    5 +
 .../core/spring-server-core-managers-context.xml   |   16 +
 server/src/com/cloud/alert/AlertManagerImpl.java   |    4 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |    1 +
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |    9 +
 server/src/com/cloud/api/query/vo/HostJoinVO.java  |   53 +-
 server/src/com/cloud/configuration/Config.java     |   51 +-
 .../configuration/ConfigurationManagerImpl.java    |   43 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    3 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   20 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |  116 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |   15 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   21 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   27 +-
 .../network/element/VirtualRouterElement.java      |  111 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   24 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |    5 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    2 +-
 .../com/cloud/network/router/NetworkHelper.java    |    5 +-
 .../cloud/network/router/NetworkHelperImpl.java    |  109 +-
 .../cloud/network/router/NicProfileHelperImpl.java |    2 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    2 +-
 .../cloud/network/router/VpcNetworkHelperImpl.java |   77 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   32 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   35 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |    8 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |   20 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |  126 +-
 .../src/com/cloud/server/ManagementServerImpl.java |    4 +-
 .../com/cloud/servlet/StaticResourceServlet.java   |  115 --
 .../com/cloud/storage/CreateSnapshotPayload.java   |    9 +
 .../src/com/cloud/storage/StorageManagerImpl.java  |   13 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   37 +-
 .../cloud/storage/snapshot/SnapshotManager.java    |   12 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   75 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    6 +-
 server/src/com/cloud/test/DatabaseConfig.java      |   38 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  100 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |    3 +-
 .../org/apache/cloudstack/acl/RoleManagerImpl.java |   43 +-
 .../annotation/AnnotationManagerImpl.java          |  149 ++
 .../org/apache/cloudstack/ca/CAManagerImpl.java    |  440 ++++++
 server/src/org/apache/cloudstack/ha/HAManager.java |   77 +
 .../org/apache/cloudstack/ha/HAManagerImpl.java    |  714 +++++++++
 .../apache/cloudstack/ha/HAResourceCounter.java    |  131 ++
 .../ha/provider/ActivityCheckerInterface.java      |   18 +-
 .../cloudstack/ha/provider/HACheckerException.java |   12 +-
 .../cloudstack/ha/provider/HAFenceException.java   |   12 +-
 .../apache/cloudstack/ha/provider/HAProvider.java  |   66 +
 .../ha/provider/HARecoveryException.java           |   11 +-
 .../ha/provider/HealthCheckerInterface.java        |   17 +-
 .../cloudstack/ha/provider/HostHAProvider.java     |    6 +-
 .../ha/provider/host/HAAbstractHostProvider.java   |  109 ++
 .../cloudstack/ha/task/ActivityCheckTask.java      |   83 +
 .../org/apache/cloudstack/ha/task/BaseHATask.java  |  111 ++
 .../org/apache/cloudstack/ha/task/FenceTask.java   |   56 +
 .../apache/cloudstack/ha/task/HealthCheckTask.java |   63 +
 .../apache/cloudstack/ha/task/RecoveryTask.java    |   58 +
 .../OutOfBandManagementServiceImpl.java            |   14 +-
 .../cloudstack/poll/BackgroundPollManagerImpl.java |    6 +-
 .../deployment/VpcRouterDeploymentDefinition.java  |   14 +-
 .../configuration/ConfigurationManagerTest.java    |  104 +-
 .../cloud/network/CreatePrivateNetworkTest.java    |    2 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    8 +-
 .../cloud/resource/MockResourceManagerImpl.java    |    5 +
 .../cloud/server/ConfigurationServerImplTest.java  |   61 +-
 .../cloud/servlet/StaticResourceServletTest.java   |  235 ---
 .../cloud/storage/VolumeApiServiceImplTest.java    |    4 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    2 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   11 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    8 +-
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    9 +-
 .../apache/cloudstack/ca/CABackgroundTaskTest.java |  151 ++
 .../apache/cloudstack/ca/CAManagerImplTest.java    |  121 ++
 .../OutOfBandManagementServiceTest.java            |    2 +-
 .../poll/BackgroundPollManagerImplTest.java        |    6 +
 .../VpcRouterDeploymentDefinitionTest.java         |   26 +-
 server/test/resources/db.properties                |    2 +-
 services/iam/plugin/test/resources/db.properties   |    2 +-
 .../SecondaryStorageManagerImpl.java               |    3 +-
 .../resource/NfsSecondaryStorageResource.java      |   93 +-
 .../storage/template/DownloadManagerImpl.java      |   76 +-
 setup/bindir/cloud-migrate-databases.in            |    2 +-
 setup/bindir/cloud-set-guest-sshkey-configdrive.in |    2 +-
 setup/bindir/cloud-set-guest-sshkey.in             |    4 +-
 setup/bindir/cloud-setup-databases.in              |    2 +-
 setup/bindir/cloud-setup-encryption.in             |   10 +-
 setup/db/db/schema-41000to41100-cleanup.sql        |    4 +
 setup/db/db/schema-41000to41100.sql                |  173 +++
 setup/db/db/schema-481to490-cleanup.sql            |   76 -
 setup/db/db/schema-481to490.sql                    |   78 +-
 setup/db/db/schema-4930to41000.sql                 |    2 +-
 setup/db/server-setup.sql                          |    3 +
 setup/db/server-setup.xml                          |    7 +
 .../debian/config/opt/cloud/bin/configure.py       |   11 +-
 .../patches/debian/config/opt/cloud/bin/cs_vmp.py  |   12 +-
 .../debian/config/opt/cloud/bin/patchsystemvm.sh   |   15 +-
 systemvm/pom.xml                                   |    5 +
 systemvm/systemvm-descriptor.xml                   |    9 +
 test/integration/component/test_host.py            |  205 +++
 test/integration/component/test_host_ha.py         |  289 ++--
 test/integration/component/test_host_ha.sh         |   86 +-
 .../test_separate_backup_from_snapshot.py          |  177 +++
 test/integration/plugins/nuagevsp/nuageTestCase.py |   33 +-
 .../plugins/nuagevsp/nuage_test_data.py            |  439 +++---
 .../plugins/nuagevsp/nuage_vsp_statistics.py       |  202 +++
 .../plugins/nuagevsp/test_nuage_static_nat.py      |  177 ++-
 .../plugins/nuagevsp/test_nuage_vpc_internal_lb.py |   81 +-
 .../plugins/nuagevsp/test_nuage_vpc_network.py     |   13 +-
 .../integration/plugins/nuagevsp/test_nuage_vsp.py |   11 +-
 test/integration/smoke/test_certauthority_root.py  |  229 +++
 test/integration/smoke/test_host_annotations.py    |  178 +++
 test/integration/smoke/test_hostha_kvm.py          |  626 ++++++++
 test/integration/smoke/test_hostha_simulator.py    |  776 ++++++++++
 test/integration/smoke/test_iso.py                 |  178 ++-
 test/integration/smoke/test_nic.py                 |  175 +++
 .../smoke/test_outofbandmanagement_nestedplugin.py |  256 +++
 test/integration/smoke/test_portforwardingrules.py |  428 +++++
 test/integration/smoke/test_primary_storage.py     |  113 +-
 test/integration/smoke/test_staticroles.py         |    2 +-
 test/integration/smoke/test_templates.py           |  199 +++
 .../testpaths/testpath_delta_snapshots.py          |  540 +++++++
 tools/apidoc/build-apidoc.sh                       |    2 +-
 tools/apidoc/gen_toc.py                            |    8 +-
 tools/apidoc/pom.xml                               |    4 +-
 tools/build/build_asf.sh                           |    8 +-
 tools/docker/supervisord.conf                      |    2 +-
 tools/eclipse/eclipse.epf                          |    2 +-
 tools/marvin/marvin/codes.py                       |    1 +
 tools/marvin/marvin/config/test_data.py            |   13 +-
 tools/marvin/marvin/lib/base.py                    |   40 +-
 tools/marvin/setup.py                              |    2 +-
 tools/travis/before_install.sh                     |    7 +-
 tools/travis/install.sh                            |    2 +-
 tools/travis/script.sh                             |    1 +
 ui/css/cloudstack3.css                             |   59 +
 ui/images/sprites.png                              |  Bin 198421 -> 207062 
bytes
 ui/index.html                                      |    1 +
 ui/l10n/en.js                                      |   13 +
 ui/plugins/cloudian/cloudian.css                   |   18 +
 ui/plugins/cloudian/cloudian.js                    |   66 +
 .../plugins/cloudian/config.js                     |   14 +-
 ui/plugins/cloudian/icon.png                       |  Bin 0 -> 1099 bytes
 ui/plugins/plugins.js                              |    1 +
 ui/scripts/configuration.js                        |   80 +
 ui/scripts/dashboard.js                            |    2 +-
 ui/scripts/domains.js                              |    2 +
 ui/scripts/instances.js                            |    1 +
 ui/scripts/storage.js                              |    7 +-
 ui/scripts/system.js                               |  539 +++++--
 ui/scripts/ui-custom/ca.js                         |   53 +
 ui/scripts/ui-custom/saml.js                       |    5 +-
 ui/scripts/vpc.js                                  |   15 +-
 usage/pom.xml                                      |    2 +-
 usage/src/com/cloud/usage/UsageServer.java         |   31 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |    7 +-
 usage/test/resources/db.properties                 |    2 +-
 utils/conf/db.properties                           |    2 +-
 utils/pom.xml                                      |   21 +-
 .../main/java/com/cloud/utils/PropertiesUtil.java  |    4 -
 .../java/com/cloud/utils/SerialVersionUID.java     |    1 +
 .../src/main/java/com/cloud/utils/StringUtils.java |    8 +
 utils/src/main/java/com/cloud/utils/UriUtils.java  |   50 +
 .../utils/exception/TaskExecutionException.java    |    2 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |   27 +
 utils/src/main/java/com/cloud/utils/nio/Link.java  |  185 +--
 .../main/java/com/cloud/utils/nio/NioClient.java   |    2 +-
 .../java/com/cloud/utils/nio/NioConnection.java    |   27 +-
 .../main/java/com/cloud/utils/nio/NioServer.java   |    4 +-
 .../main/java/com/cloud/utils/script/Script.java   |    3 +-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |   93 +-
 .../cloudstack/utils/security/CertUtils.java       |  252 +++
 .../cloudstack/utils/security/ChecksumValue.java   |   86 +
 .../cloudstack/utils/security/DigestHelper.java    |   96 ++
 .../cloudstack/utils/security/KeyStoreUtils.java   |   41 +
 .../test/java/com/cloud/utils/StringUtilsTest.java |   13 +
 .../test/java/com/cloud/utils/UriUtilsTest.java    |   46 +-
 .../java/com/cloud/utils/net/NetUtilsTest.java     |   18 +
 .../java/com/cloud/utils/testcase/NioTest.java     |    2 +-
 .../cloudstack/utils/security/CertUtilsTest.java   |  118 ++
 .../utils/security/DigestHelperTest.java           |  102 ++
 vmware-base/pom.xml                                |    5 +
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java    |   28 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  283 +++-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |   43 +-
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |   17 +-
 .../hypervisor/vmware/mo/DatastoreMOTest.java      |  114 ++
 .../vmware/mo/HypervisorHostHelperTest.java        |  139 +-
 .../hypervisor/vmware/mo/VirtualMachineMOTest.java |  120 ++
 585 files changed, 24518 insertions(+), 16011 deletions(-)
 copy api/src/{com/cloud/storage/ImageStore.java => 
org/apache/cloudstack/annotation/Annotation.java} (68%)
 create mode 100644 
api/src/org/apache/cloudstack/annotation/AnnotationService.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/AnnotationResponse.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/CAProviderResponse.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/CertificateResponse.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/HAProviderResponse.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/HostHAResponse.java
 create mode 100644 api/src/org/apache/cloudstack/ca/CAManager.java
 create mode 100644 api/src/org/apache/cloudstack/ha/HAConfig.java
 create mode 100644 api/src/org/apache/cloudstack/ha/HAConfigManager.java
 copy api/src/org/apache/cloudstack/{poll/BackgroundPollTask.java => 
ha/HAResource.java} (68%)
 copy api/src/org/apache/cloudstack/{poll/BackgroundPollTask.java => 
kernel/Partition.java} (72%)
 copy 
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDao.java
 => 
api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java
 (56%)
 rename client/{tomcatconf => conf}/commons-logging.properties.in (97%)
 rename client/{tomcatconf => conf}/db.properties.in (97%)
 rename client/{tomcatconf => conf}/ehcache.xml.in (98%)
 rename client/{tomcatconf => conf}/environment.properties.in (99%)
 rename client/{tomcatconf => conf}/java.security.ciphers.in (100%)
 rename client/{tomcatconf => conf}/log4j-cloud.xml.in (99%)
 copy tools/travis/script.sh => client/conf/server.properties.in (50%)
 mode change 100755 => 100644
 delete mode 100755 
client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 
client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 
client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 
client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in
 delete mode 100644 
client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100644 
client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/sles/SYSCONFDIR/init.d/cloud-management.in
 delete mode 100644 client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
 create mode 100644 client/src/org/apache/cloudstack/ServerDaemon.java
 delete mode 100644 client/tomcatconf/catalina.policy.in
 delete mode 100644 client/tomcatconf/catalina.properties.in
 delete mode 100644 client/tomcatconf/classpath.conf.in
 delete mode 100644 client/tomcatconf/cloudmanagementserver.keystore
 delete mode 100644 client/tomcatconf/context.xml.in
 delete mode 100644 client/tomcatconf/logging.properties.in
 delete mode 100755 client/tomcatconf/server-nonssl.xml.in
 delete mode 100755 client/tomcatconf/server-ssl.xml.in
 delete mode 100755 client/tomcatconf/server7-nonssl.xml.in
 delete mode 100755 client/tomcatconf/server7-ssl.xml.in
 delete mode 100644 client/tomcatconf/tomcat-users.xml.in
 delete mode 100644 client/tomcatconf/tomcat6-nonssl.conf.in
 delete mode 100644 client/tomcatconf/tomcat6-ssl.conf.in
 delete mode 100644 client/tomcatconf/web.xml.in
 rename packaging/centos63/tomcat.sh => 
core/resources/META-INF/cloudstack/ca/module.properties (95%)
 copy 
core/resources/META-INF/cloudstack/{compute/spring-core-lifecycle-compute-context-inheritable.xml
 => ca/spring-core-lifecycle-ca-context-inheritable.xml} (52%)
 create mode 100644 
core/src/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
core/src/org/apache/cloudstack/ca/SetupCertificateAnswer.java (76%)
 create mode 100644 
core/src/org/apache/cloudstack/ca/SetupCertificateCommand.java
 create mode 100644 core/src/org/apache/cloudstack/ca/SetupKeyStoreCommand.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
core/src/org/apache/cloudstack/ca/SetupKeystoreAnswer.java (64%)
 mode change 100644 => 100755 debian/cloudstack-agent.postinst
 mode change 100644 => 100755 debian/cloudstack-management.postinst
 rename packaging/fedora21/cloudstack-sccs => 
debian/cloudstack-management.preinst (65%)
 mode change 100644 => 100755
 mode change 100644 => 100755 debian/cloudstack-marvin.postinst
 mode change 100644 => 100755 debian/cloudstack-usage.postinst
 create mode 100644 engine/schema/src/com/cloud/certificate/CrlVO.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
engine/schema/src/com/cloud/certificate/dao/CrlDao.java (70%)
 create mode 100644 engine/schema/src/com/cloud/certificate/dao/CrlDaoImpl.java
 create mode 100644 
engine/schema/src/org/apache/cloudstack/annotation/AnnotationVO.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDao.java (66%)
 create mode 100644 
engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java
 copy 
engine/schema/src/org/apache/cloudstack/{outofbandmanagement/OutOfBandManagementVO.java
 => ha/HAConfigVO.java} (55%)
 copy 
engine/{api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java
 => schema/src/org/apache/cloudstack/ha/dao/HAConfigDao.java} (56%)
 create mode 100644 
engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java
 rename 
engine/storage/{src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDao.java
 => 
snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java}
 (56%)
 delete mode 100644 
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
 delete mode 100644 
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java
 copy {plugins/network-elements/globodns => framework/ca}/pom.xml (65%)
 create mode 100644 
framework/ca/src/org/apache/cloudstack/framework/ca/CAProvider.java
 create mode 100644 
framework/ca/src/org/apache/cloudstack/framework/ca/CAService.java
 copy core/src/com/cloud/agent/api/ComputeChecksumCommand.java => 
framework/ca/src/org/apache/cloudstack/framework/ca/Certificate.java (50%)
 delete mode 100644 packaging/centos63/cloud-management.sysconfig
 delete mode 100644 packaging/centos7/tomcat7/catalina.properties
 delete mode 100644 packaging/centos7/tomcat7/commons-logging.properties
 delete mode 100644 packaging/centos7/tomcat7/db.properties
 delete mode 100644 packaging/centos7/tomcat7/environment.properties
 delete mode 100644 packaging/centos7/tomcat7/java.security.ciphers
 delete mode 100644 packaging/centos7/tomcat7/log4j-cloud.xml
 delete mode 100644 packaging/centos7/tomcat7/server.xml
 delete mode 100644 packaging/centos7/tomcat7/tomcat-users.xml
 delete mode 100644 packaging/centos7/tomcat7/web.xml
 delete mode 100755 packaging/fedora20/cloud-agent.rc
 delete mode 100755 packaging/fedora20/cloud-ipallocator.rc
 delete mode 100755 packaging/fedora20/cloud-management.rc
 delete mode 100644 packaging/fedora20/cloud-management.sysconfig
 delete mode 100755 packaging/fedora20/cloud-usage.rc
 delete mode 100644 packaging/fedora20/cloud.spec
 delete mode 100644 packaging/fedora20/cloudstack-agent.te
 delete mode 100644 packaging/fedora20/cloudstack-sccs
 delete mode 100644 packaging/fedora20/replace.properties
 delete mode 100755 packaging/fedora21/cloud-agent.rc
 delete mode 100755 packaging/fedora21/cloud-ipallocator.rc
 delete mode 100755 packaging/fedora21/cloud-management.rc
 delete mode 100644 packaging/fedora21/cloud-management.sysconfig
 delete mode 100755 packaging/fedora21/cloud-usage.rc
 delete mode 100644 packaging/fedora21/cloud.spec
 delete mode 100644 packaging/fedora21/cloudstack-agent.te
 delete mode 100644 packaging/fedora21/replace.properties
 delete mode 100644 packaging/systemd/cloudstack-management.default.ubuntu
 delete mode 100644 packaging/systemd/cloudstack-management.service.ubuntu
 rename plugins/{network-elements/midonet => ca/root-ca}/pom.xml (62%)
 rename packaging/fedora21/tomcat.sh => 
plugins/ca/root-ca/resources/META-INF/cloudstack/root-ca/module.properties (97%)
 rename 
plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet/spring-midonet-context.xml
 => 
ca/root-ca/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml} 
(58%)
 create mode 100644 
plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java
 create mode 100644 
plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCAProvider.java
 create mode 100644 
plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java
 create mode 100644 
plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java
 create mode 100644 
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAConfig.java
 create mode 100644 
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAProvider.java
 create mode 100644 
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java
 create mode 100644 
plugins/hypervisors/kvm/test/org/apache/cloudstack/kvm/ha/KVMHostHATest.java
 create mode 100644 
plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java
 create mode 100644 
plugins/hypervisors/simulator/src/com/cloud/api/commands/ListSimulatorHAStateTransitions.java
 create mode 100644 
plugins/hypervisors/simulator/src/com/cloud/api/response/SimulatorHAStateResponse.java
 create mode 100644 
plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAProvider.java
 create mode 100644 
plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAState.java
 create mode 100644 
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java
 copy {api => plugins/integrations/cloudian}/pom.xml (56%)
 rename packaging/fedora20/tomcat.sh => 
plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties
 (96%)
 copy 
plugins/{hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml
 => 
integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml}
 (64%)
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java
 copy core/src/com/cloud/agent/api/ComputeChecksumCommand.java => 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java
 (50%)
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java
 create mode 100644 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java
 copy core/src/com/cloud/agent/api/ComputeChecksumCommand.java => 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java
 (53%)
 copy 
engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
 => 
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java
 (60%)
 create mode 100644 
plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java
 copy plugins/{event-bus/rabbitmq => integrations/prometheus}/pom.xml (66%)
 copy plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet 
=> 
integrations/prometheus/resources/META-INF/cloudstack/prometheus}/module.properties
 (96%)
 copy 
plugins/{hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml
 => 
integrations/prometheus/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml}
 (63%)
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporter.java
 (86%)
 create mode 100644 
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
 create mode 100644 
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServer.java
 create mode 100644 
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java
 delete mode 100644 
plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
 delete mode 100644 
plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java
 delete mode 100644 
plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
 delete mode 100644 
plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
 delete mode 100644 
plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java
 delete mode 100644 
plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java
 copy utils/src/main/java/com/cloud/utils/exception/TaskExecutionException.java 
=> 
plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java
 (52%)
 create mode 100644 
plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/AbstractListener.java
 create mode 100644 
plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBean.java
 create mode 100644 
plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/VspStatisticsMBeanImpl.java
 copy plugins/{event-bus/kafka => 
outofbandmanagement-drivers/nested-cloudstack}/pom.xml (63%)
 rename plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet 
=> 
outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack}/module.properties
 (94%)
 copy 
plugins/{hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml
 => 
outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml}
 (64%)
 create mode 100644 
plugins/outofbandmanagement-drivers/nested-cloudstack/src/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java
 create mode 100644 
plugins/outofbandmanagement-drivers/nested-cloudstack/test/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java
 create mode 100644 
plugins/storage/volume/default/test/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java
 delete mode 100644 scripts/common/keys/ssl-keys.py
 create mode 100755 scripts/util/keystore-cert-import
 create mode 100755 scripts/util/keystore-setup
 create mode 100755 scripts/vm/hypervisor/kvm/kvmvmactivity.sh
 delete mode 100644 server/src/com/cloud/servlet/StaticResourceServlet.java
 mode change 100755 => 100644 server/src/com/cloud/vm/UserVmManagerImpl.java
 create mode 100644 
server/src/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
 create mode 100644 server/src/org/apache/cloudstack/ca/CAManagerImpl.java
 create mode 100644 server/src/org/apache/cloudstack/ha/HAManager.java
 create mode 100644 server/src/org/apache/cloudstack/ha/HAManagerImpl.java
 create mode 100644 server/src/org/apache/cloudstack/ha/HAResourceCounter.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java (64%)
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/HACheckerException.java (76%)
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/HAFenceException.java (77%)
 create mode 100644 server/src/org/apache/cloudstack/ha/provider/HAProvider.java
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/HARecoveryException.java (76%)
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java (67%)
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
server/src/org/apache/cloudstack/ha/provider/HostHAProvider.java (86%)
 create mode 100644 
server/src/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java
 create mode 100644 
server/src/org/apache/cloudstack/ha/task/ActivityCheckTask.java
 create mode 100644 server/src/org/apache/cloudstack/ha/task/BaseHATask.java
 create mode 100644 server/src/org/apache/cloudstack/ha/task/FenceTask.java
 create mode 100644 
server/src/org/apache/cloudstack/ha/task/HealthCheckTask.java
 create mode 100644 server/src/org/apache/cloudstack/ha/task/RecoveryTask.java
 delete mode 100644 server/test/com/cloud/servlet/StaticResourceServletTest.java
 create mode 100644 
server/test/org/apache/cloudstack/ca/CABackgroundTaskTest.java
 create mode 100644 server/test/org/apache/cloudstack/ca/CAManagerImplTest.java
 create mode 100644 test/integration/component/test_host.py
 create mode 100644 
test/integration/component/test_separate_backup_from_snapshot.py
 copy tools/marvin/marvin/config/test_data.py => 
test/integration/plugins/nuagevsp/nuage_test_data.py (87%)
 create mode 100644 test/integration/plugins/nuagevsp/nuage_vsp_statistics.py
 create mode 100644 test/integration/smoke/test_certauthority_root.py
 create mode 100644 test/integration/smoke/test_host_annotations.py
 create mode 100644 test/integration/smoke/test_hostha_kvm.py
 create mode 100644 test/integration/smoke/test_hostha_simulator.py
 create mode 100644 
test/integration/smoke/test_outofbandmanagement_nestedplugin.py
 create mode 100644 test/integration/smoke/test_portforwardingrules.py
 create mode 100644 test/integration/testpaths/testpath_delta_snapshots.py
 create mode 100644 ui/plugins/cloudian/cloudian.css
 create mode 100644 ui/plugins/cloudian/cloudian.js
 copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java => 
ui/plugins/cloudian/config.js (75%)
 create mode 100644 ui/plugins/cloudian/icon.png
 create mode 100644 ui/scripts/ui-custom/ca.js
 create mode 100644 
utils/src/main/java/org/apache/cloudstack/utils/security/CertUtils.java
 create mode 100644 
utils/src/main/java/org/apache/cloudstack/utils/security/ChecksumValue.java
 create mode 100644 
utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
 create mode 100644 
utils/src/main/java/org/apache/cloudstack/utils/security/KeyStoreUtils.java
 create mode 100644 
utils/src/test/java/org/apache/cloudstack/utils/security/CertUtilsTest.java
 create mode 100644 
utils/src/test/java/org/apache/cloudstack/utils/security/DigestHelperTest.java
 create mode 100644 
vmware-base/test/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java
 create mode 100644 
vmware-base/test/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Reply via email to