This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 41fe7ad Merge branch 'master' into 4.13
omit c6e67c4 ui: display drop down list for VPN customer gateway selection
(#3805)
omit f78cbf4 ssvm: wrong SSVM behavior causes redownloading for all the
templates (#3844)
omit 4d0c6b7 packaging: install python-dnspython or python-dns to fix
issue with cloudstack-setup-management (#3854)
omit a746b29 ui: fix default text missing from network selection on
instance wizard (#3865)
omit 10482da Merge release branch 4.13 to master
omit 33e9a50 Merge remote-tracking branch 'origin/4.13'
omit 107bba3 router: start all Site-to-Site VPN connections when VPC VR
starts (#3863)
omit 0f5b0e6 VM ingestion (#3606)
omit 6d014fa network: de-associate IP address if enabling static nat fails
(#3836)
omit a2a4968 server: Allow creating network with duplicate name (#3807)
omit 1a5b7c3 engine/orchestration: display numeric value instead of
variable name (#3818)
omit f72f39c Merge remote-tracking branch 'origin/4.13'
omit 424f10c Merge remote-tracking branch 'origin/4.13'
omit f5551be Merge branch '4.13'
omit c0abfce Health check feature for virtual router (#3575)
omit f1149bc [CLOUDSTACK-10408] Fix String.replaceAll() to replace() for
bet… (#3275)
omit 99ec8a8 Merge release branch 4.13 to master
omit ac581d1 New feature: Resource count (CPU/RAM) take only running vms
into calculation (#3760)
omit 518ed53 Merge remote-tracking branch 'origin/4.13'
omit 920531f network: set restart_required to 0 after restarting network
(#3803)
omit a54afa8 Merge remote-tracking branch 'origin/4.13'
omit 28fb93f Merge remote-tracking branch 'origin/4.13'
omit cf2be8a Merge remote-tracking branch 'origin/4.13'
omit 0cb2db6 Merge remote-tracking branch 'origin/4.13'
omit 5ef5ef6 README: Update Docker README file (#3835)
omit 0095272 upgrade: kvm-local-pool-trailing-slash (#3813)
omit ac20263 Incorrect param name caused global setting test to fail
(#3821)
omit f276485 Merge release branch 4.13 to master
omit a813c24 set TCP as default protocol in lb list (#3822)
omit 5ff932e Ldap fixes (#3694)
omit 9b7acfd Update message when keys are NOT being injected (#3799)
omit 09e812f Merge branch '4.13'
omit 4780a27 Add missing HA config keys (#3776) (#3814)
omit be97470 Get Diagnostics: Download logs and diagnostics data from
SSVM, CPVM, Router (#3350)
omit cc093c6 README: put the original logo back
omit d8a2f5d Fix typo: the past tense of shutdown is shutdown, not
shutdowned (#3659)
omit 1771727 Revert "Extract systemvm.iso using bsdtar (#3536)" (#3800)
omit 70fcf75 Allow additional configuration metadata to VMs (#3510)
omit dfd950c Add protocol number support for security group rules (#3736)
omit f2708d6 Merge release branch 4.13 to master
omit 7ceb82c Revert "Simulator: Better VR Redundant Status Behaviour
(#3313)" (#3796)
omit 6e19c17 Merge release branch 4.13 to master
omit 8a55c93 Extract systemvm.iso using bsdtar (#3536)
omit d868cd1 Simulator: Better VR Redundant Status Behaviour (#3313)
omit 74f5632 Merge release branch 4.13 to master
omit 809561a Merge release branch 4.13 to master
omit d55a2af Bug fix: Dont display empty item in free ip list (#3790)
omit 4fa7fad Merge release branch 4.13 to master
omit 482e7eb New feature: Acquire specific public IP for network (#3775)
omit 06e1212 Merge release branch 4.13 to master
omit 482d0fd 4.13 (#3782)
omit 0606039 Honour promiscuous mode from networkOffering (#3765) (#3781)
omit 45503e1 Revert "Revert "Fix virtual template size for managed storage
for KVM / refactor cloud-install-sys-tmplt (#3371)" (#3771)" (#3772)
omit 4b43c26 Better tracking host maintanence and handling of migration
jobs (#3425)
omit cf6e616 Revert "Add missing HA config keys (#3737)" (#3774)
omit e319c8b Revert "Fix virtual template size for managed storage for KVM
/ refactor cloud-install-sys-tmplt (#3371)" (#3771)
omit a0efbf9 Fix virtual template size for managed storage for KVM /
refactor cloud-install-sys-tmplt (#3371)
omit 16527f1 Add missing HA config keys (#3737)
omit 2e8c069 Load Average for KVM (#3738)
omit da62cec README: that time of the year! 🎄 (#3769)
omit 0d92b92 Fix OS category for some OS-es added in 4.13 (#3746)
omit 93aad24 storage: Handle RBD snapshot deletion (#3615)
omit 29e1bbc server: rethrow takeVMSnapshot() exception instead of
returning null (#3546)
omit 7a86ca7 ui: show memory usage in VM statistics (#3474)
omit 6f3694c server: save SSH.PublicKey into user_vm_details regardless of
password management (#3745)
omit e56fa31 ssh: Add support for ecdsa and ed25519 public keys (#3740)
omit 828405d Merge branch '4.13'
omit f30b5ce Fix resource count of expunged volume (#3669)
omit 2427114 a conditional to prevent creation of a field (#3723)
omit b8676ae Merge release branch 4.13 to master
omit e93f6bf utils: use iproute to get default network interface (#3704)
omit a65a931 ui: increase width of name field in UI (#3703)
omit 3220705 setup: env config for dual zone simulator (#3696)
omit e1ccbfb debian: fix symlink issue post install/upgrade (#3695)
omit 24db4d8 security_group.py: check cidr unstrictly to accept cidrs like
1.1.1.1/24 (#3701)
omit 114df3d Forward merge apache/4.13 to master
omit 80abb5a Fix VR creation issue while creating VM on shared network
using PVLAN (#3653)
omit fc9a525 New BuildRequires for CentOS 7: python-setuptools (#3630)
omit 4cce43f Add support for vSphere Web SDK 6.7 installation in
install-non-oss.sh (#3650)
omit c863cc2 add class cleanup method (#3632)
omit c8681f5 ui: fix migrate host form no host popup (#3682)
omit 96d98de Merge remote-tracking branch 'origin/4.13'
omit 7f5096a storage: don't select an SSVM that is removed (#3668)
omit a9b4da6 server: reduce verbosity of Async Job Manager log messages
(#3616)
omit 524b995 IoT/ARM64 support: allow cloudstack-agent on Raspberry Pi 4
(armv8) to use kvm acceleration (#3644)
omit b0e3fbe Merge remote-tracking branch 'origin/4.13'
omit 4d7e95e kvm: Use 'ip' instead of 'brctl' (#3623)
omit afab9fb client: jetty session timeout set after server is started
(#3658)
omit 3b82aba .gitignore: ignore patches and unzipped logs (#3665)
omit d3f199f Increase DHCP lease time to infinite (#3662)
omit 2394fda Merge remote-tracking branch 'origin/4.13'
omit 848860d security_group.py: fix NameError: name 'd' is not defined
(#3641)
omit 9258c7c Revert "9ee129ae6a08935645734ad520bec72bf5f22217"
omit 9ee129a NioServer: retain links by address string to minimize
resource leak (#3525)
omit 294813e Merge remote-tracking branch 'origin/4.13'
omit 666ec69 Merge remote-tracking branch 'origin/4.13'
omit 899eab6 kvm/security_group: Make Security Group Python 3 compatible
(#3589)
omit 6cec7c7 allocator: in case of null guest OS don't fail prioritisation
completely (#3607)
omit 7f91964 refactoring: Remove duplicate code (by Frank/Nuage) (#3538)
omit 8170ec5 kvm: Logrotate should not touch agent.log (#3597)
omit 89053c7 packaging: deprecate el6 and add 4.13-4.14 upgrade path
(#3591)
omit c01ce7b2 Merge remote-tracking branch 'origin/4.13'
omit 8da0556 kvm/cloudstack-guest-tool: Tool to query Qemu Guest Agent
(#3519)
omit fbec3b3 Merge remote-tracking branch 'origin/4.13'
omit 12f0ac6 Merge branch '4.13' into master
omit 50fc045 Updating pom.xml version numbers for release 4.14.0.0-SNAPSHOT
new f769c66 ui: fix default text missing from network selection on
instance wizard (#3865)
new cd55674 packaging: install python-dnspython or python-dns to fix
issue with cloudstack-setup-management (#3854)
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 (41fe7ad)
\
N -- N -- N refs/heads/4.13 (cd55674)
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 2 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:
.gitignore | 3 +-
.travis.yml | 1 -
agent/bindir/cloud-guest-tool.in | 129 ---
agent/conf/agent.properties | 6 -
agent/pom.xml | 2 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/to/DataObjectType.java | 2 +-
api/src/main/java/com/cloud/event/EventTypes.java | 17 +-
api/src/main/java/com/cloud/host/HostStats.java | 2 +-
.../java/com/cloud/network/NetworkService.java | 6 +-
.../com/cloud/network/RouterHealthCheckResult.java | 34 -
.../network/VirtualNetworkApplianceService.java | 18 +-
.../java/com/cloud/network/vpc/VpcService.java | 6 +-
.../java/com/cloud/resource/ResourceState.java | 41 +-
api/src/main/java/com/cloud/storage/Storage.java | 5 +-
.../com/cloud/template/VirtualMachineTemplate.java | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 6 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 2 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 8 -
.../org/apache/cloudstack/api/ApiConstants.java | 32 -
.../cloudstack/api/BaseListTaggedResourcesCmd.java | 22 +-
.../api/BaseListTemplateOrIsoPermissionsCmd.java | 8 +-
.../apache/cloudstack/api/ResponseGenerator.java | 4 -
.../org/apache/cloudstack/api/TaggedResources.java | 72 --
.../api/command/ResponseViewProvider.java | 26 -
.../cloudstack/api/command/admin/AdminCmd.java | 29 -
.../admin/address/AssociateIPAddrCmdByAdmin.java | 39 +-
.../address/ListPublicIpAddressesCmdByAdmin.java | 29 +-
.../UpdateVMAffinityGroupCmdByAdmin.java | 34 +-
.../admin/diagnostics/GetDiagnosticsDataCmd.java | 157 ---
.../api/command/admin/domain/ListDomainsCmd.java | 3 +-
.../admin/domain/ListDomainsCmdByAdmin.java | 4 +-
.../admin/host/PrepareForMaintenanceCmd.java | 22 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 10 -
.../api/command/admin/iso/AttachIsoCmdByAdmin.java | 31 +-
.../api/command/admin/iso/DetachIsoCmdByAdmin.java | 25 +-
.../admin/iso/ListIsoPermissionsCmdByAdmin.java | 14 +-
.../api/command/admin/iso/ListIsosCmdByAdmin.java | 3 +-
.../command/admin/iso/RegisterIsoCmdByAdmin.java | 30 +-
.../api/command/admin/iso/UpdateIsoCmdByAdmin.java | 22 +-
.../ListLoadBalancerRuleInstancesCmdByAdmin.java | 69 +-
.../admin/network/CreateNetworkCmdByAdmin.java | 25 +-
.../admin/network/ListNetworksCmdByAdmin.java | 26 +-
.../admin/network/UpdateNetworkCmdByAdmin.java | 29 +-
.../router/GetRouterHealthCheckResultsCmd.java | 117 --
.../api/command/admin/router/ListRoutersCmd.java | 10 -
.../admin/template/CopyTemplateCmdByAdmin.java | 48 +-
.../admin/template/CreateTemplateCmdByAdmin.java | 41 +-
.../ListTemplatePermissionsCmdByAdmin.java | 10 +-
.../admin/template/ListTemplatesCmdByAdmin.java | 3 +-
.../admin/template/RegisterTemplateCmdByAdmin.java | 37 +-
.../admin/template/UpdateTemplateCmdByAdmin.java | 25 +-
.../api/command/admin/vm/AddNicToVMCmdByAdmin.java | 32 +-
.../api/command/admin/vm/DeployVMCmdByAdmin.java | 51 +-
.../api/command/admin/vm/DestroyVMCmdByAdmin.java | 34 +-
.../admin/vm/ImportUnmanagedInstanceCmd.java | 300 -----
.../admin/vm/ListUnmanagedInstancesCmd.java | 113 --
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 3 +-
.../api/command/admin/vm/RebootVMCmdByAdmin.java | 28 +-
.../admin/vm/RemoveNicFromVMCmdByAdmin.java | 32 +-
.../admin/vm/ResetVMPasswordCmdByAdmin.java | 29 +-
.../command/admin/vm/ResetVMSSHKeyCmdByAdmin.java | 32 +-
.../api/command/admin/vm/RestoreVMCmdByAdmin.java | 31 +-
.../api/command/admin/vm/ScaleVMCmdByAdmin.java | 45 +-
.../api/command/admin/vm/StartVMCmdByAdmin.java | 57 +-
.../api/command/admin/vm/StopVMCmdByAdmin.java | 30 +-
.../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java | 33 +-
.../api/command/admin/vm/UpdateVMCmdByAdmin.java | 27 +-
.../api/command/admin/vm/UpgradeVMCmdByAdmin.java | 34 +-
.../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java | 36 +-
.../admin/volume/AttachVolumeCmdByAdmin.java | 24 +-
.../admin/volume/CreateVolumeCmdByAdmin.java | 37 +-
.../admin/volume/DetachVolumeCmdByAdmin.java | 25 +-
.../admin/volume/ListVolumesCmdByAdmin.java | 5 +-
.../admin/volume/MigrateVolumeCmdByAdmin.java | 19 +-
.../admin/volume/ResizeVolumeCmdByAdmin.java | 30 +-
.../admin/volume/UpdateVolumeCmdByAdmin.java | 21 +-
.../admin/volume/UploadVolumeCmdByAdmin.java | 33 +-
.../api/command/admin/vpc/CreateVPCCmdByAdmin.java | 44 +-
.../api/command/admin/vpc/ListVPCsCmdByAdmin.java | 30 +-
.../api/command/admin/vpc/UpdateVPCCmdByAdmin.java | 23 +-
.../command/admin/zone/ListZonesCmdByAdmin.java | 3 +-
.../cloudstack/api/command/user/UserCmd.java | 29 -
.../api/command/user/account/ListAccountsCmd.java | 3 +-
.../command/user/address/AssociateIPAddrCmd.java | 14 +-
.../user/address/ListPublicIpAddressesCmd.java | 5 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 7 +-
.../api/command/user/iso/AttachIsoCmd.java | 5 +-
.../api/command/user/iso/DetachIsoCmd.java | 5 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 8 +-
.../api/command/user/iso/ListIsosCmd.java | 3 +-
.../api/command/user/iso/RegisterIsoCmd.java | 5 +-
.../api/command/user/iso/UpdateIsoCmd.java | 5 +-
.../ListLoadBalancerRuleInstancesCmd.java | 6 +-
.../api/command/user/network/CreateNetworkCmd.java | 5 +-
.../api/command/user/network/ListNetworksCmd.java | 5 +-
.../command/user/network/RestartNetworkCmd.java | 2 +-
.../api/command/user/network/UpdateNetworkCmd.java | 5 +-
.../api/command/user/project/ListProjectsCmd.java | 21 +-
.../AuthorizeSecurityGroupIngressCmd.java | 2 +-
.../api/command/user/tag/CreateTagsCmd.java | 18 +-
.../api/command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/CreateTemplateCmd.java | 10 +-
.../user/template/ListTemplatePermissionsCmd.java | 8 +-
.../command/user/template/ListTemplatesCmd.java | 3 +-
.../command/user/template/RegisterTemplateCmd.java | 5 +-
.../command/user/template/UpdateTemplateCmd.java | 5 +-
.../api/command/user/vm/AddNicToVMCmd.java | 5 +-
.../api/command/user/vm/DeployVMCmd.java | 78 +-
.../api/command/user/vm/DestroyVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 3 +-
.../api/command/user/vm/RebootVMCmd.java | 5 +-
.../api/command/user/vm/RemoveNicFromVMCmd.java | 5 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 5 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 5 +-
.../api/command/user/vm/RestoreVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 13 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 5 +-
.../command/user/vm/UpdateDefaultNicForVMCmd.java | 5 +-
.../api/command/user/vm/UpdateVMCmd.java | 7 +-
.../api/command/user/vm/UpgradeVMCmd.java | 5 +-
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 5 +-
.../command/user/volume/AddResourceDetailCmd.java | 21 +-
.../api/command/user/volume/AttachVolumeCmd.java | 5 +-
.../api/command/user/volume/CreateVolumeCmd.java | 5 +-
.../api/command/user/volume/DetachVolumeCmd.java | 5 +-
.../api/command/user/volume/ListVolumesCmd.java | 3 +-
.../api/command/user/volume/MigrateVolumeCmd.java | 5 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 5 +-
.../api/command/user/volume/UpdateVolumeCmd.java | 5 +-
.../api/command/user/volume/UploadVolumeCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 5 +-
.../api/command/user/vpc/ListVPCsCmd.java | 5 +-
.../api/command/user/vpc/RestartVPCCmd.java | 2 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 5 +-
.../api/command/user/zone/ListZonesCmd.java | 26 +-
.../api/response/DomainRouterResponse.java | 32 +-
.../cloudstack/api/response/HostResponse.java | 12 +-
.../cloudstack/api/response/NicResponse.java | 69 +-
.../response/RouterHealthCheckResultResponse.java | 88 --
.../RouterHealthCheckResultsListResponse.java | 52 -
.../response/UnmanagedInstanceDiskResponse.java | 159 ---
.../api/response/UnmanagedInstanceResponse.java | 190 ---
.../diagnostics/GetDiagnosticsDataResponse.java | 40 -
.../cloudstack/diagnostics/DiagnosticsService.java | 8 +-
.../org/apache/cloudstack/query/QueryService.java | 6 -
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 353 ------
.../org/apache/cloudstack/vm/VmImportService.java | 31 -
.../api/command/test/AddIpToVmNicTest.java | 2 +
.../api/command/test/ListCfgCmdTest.java | 2 +
.../api/command/test/UpdateCfgCmdTest.java | 2 +
client/pom.xml | 2 +-
core/pom.xml | 2 +-
.../com/cloud/agent/api/GetHostStatsAnswer.java | 5 -
.../agent/api/GetUnmanagedInstancesAnswer.java | 58 -
.../agent/api/GetUnmanagedInstancesCommand.java | 73 --
.../java/com/cloud/agent/api/HostStatsEntry.java | 11 -
.../api/routing/GetRouterMonitorResultsAnswer.java | 46 -
.../routing/GetRouterMonitorResultsCommand.java | 38 -
.../LoadRouterHealthChecksConfigCommand.java | 41 -
.../agent/api/routing/NetworkElementCommand.java | 1 +
.../api/routing/SetMonitorServiceCommand.java | 46 +-
.../agent/resource/virtualnetwork/VRScripts.java | 5 -
.../virtualnetwork/VirtualRoutingResource.java | 96 +-
.../facade/AbstractConfigItemFacade.java | 5 +-
.../facade/SetMonitorServiceConfigItem.java | 39 +-
.../resource/virtualnetwork/model/ConfigBase.java | 7 -
.../virtualnetwork/model/MonitorService.java | 60 +-
.../diagnostics/CopyToSecondaryStorageAnswer.java | 26 -
.../diagnostics/CopyToSecondaryStorageCommand.java | 53 -
.../diagnostics/DeleteFileInVrCommand.java | 36 -
.../cloudstack/diagnostics/PrepareFilesAnswer.java | 27 -
.../diagnostics/PrepareFilesCommand.java | 44 -
.../api/agent/test/CheckOnHostCommandTest.java | 2 +
debian/changelog | 14 +-
debian/cloudstack-common.install | 1 -
debian/cloudstack-usage.postinst | 13 +-
debian/control | 6 +-
debian/rules | 1 -
deps/install-non-oss.sh | 3 -
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 3 -
.../service/NetworkOrchestrationService.java | 3 -
.../service/VolumeOrchestrationService.java | 22 -
engine/components-api/pom.xml | 2 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 1 -
.../java/com/cloud/network/IpAddressManager.java | 2 +-
.../java/com/cloud/resource/ResourceManager.java | 7 +-
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 6 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 61 +-
.../datacenter/entity/api/db/EngineHostVO.java | 32 +-
.../engine/orchestration/NetworkOrchestrator.java | 67 +-
.../engine/orchestration/VolumeOrchestrator.java | 62 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../src/main/java/com/cloud/host/HostVO.java | 26 +-
.../java/com/cloud/network/dao/NetworkDao.java | 2 -
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 10 -
.../network/dao/RouterHealthCheckResultDao.java | 49 -
.../dao/RouterHealthCheckResultDaoImpl.java | 84 --
.../network/dao/RouterHealthCheckResultVO.java | 129 ---
.../com/cloud/service/dao/ServiceOfferingDao.java | 2 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 7 -
.../cloud/storage/dao/GuestOSHypervisorDao.java | 2 -
.../storage/dao/GuestOSHypervisorDaoImpl.java | 26 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 2 -
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 20 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 -
.../com/cloud/upgrade/dao/Upgrade41300to41400.java | 71 --
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 2 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 7 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 -
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 -
.../spring-engine-schema-core-daos-context.xml | 1 -
.../META-INF/db/schema-41300to41400-cleanup.sql | 25 -
.../resources/META-INF/db/schema-41300to41400.sql | 53 -
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
engine/storage/integration-test/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/CephSnapshotStrategy.java | 11 +-
.../storage/snapshot/CephSnapshotStrategyTest.java | 2 -
.../storage/endpoint/DefaultEndPointSelector.java | 1 -
engine/storage/volume/pom.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
framework/db/pom.xml | 2 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
.../framework/serializer/OnwireClassRegistry.java | 4 +-
framework/jobs/pom.xml | 2 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/README.md | 4 +-
packaging/centos63/cloud-agent.rc | 122 ++
.../{centos7 => centos63}/cloud-ipallocator.rc | 0
.../centos63/cloud-management.rc | 73 +-
.../centos63/cloud-usage.rc | 62 +-
packaging/{centos7 => centos63}/cloud.spec | 186 +--
.../{centos7 => centos63}/cloudstack-agent.te | 0
packaging/{centos7 => centos63}/cloudstack-sccs | 0
packaging/{centos7 => centos63}/replace.properties | 2 +-
.../centos63/rhel7/cloudstack-management.conf | 5 +-
packaging/centos7/cloud.spec | 7 -
packaging/package.sh | 2 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../networkservice/BareMetalResourceBase.java | 20 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../resource/HypervDirectConnectResource.java | 5 -
.../test/HypervDirectConnectResourceTest.java | 2 +
plugins/hypervisors/kvm/pom.xml | 2 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 4 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 2 +-
.../kvm/resource/LibvirtCapXMLParser.java | 3 +-
.../kvm/resource/LibvirtComputingResource.java | 46 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 42 +-
.../LibvirtCopyToSecondaryStorageWrapper.java | 87 --
.../wrapper/LibvirtGetHostStatsCommandWrapper.java | 3 +-
.../org/apache/cloudstack/utils/linux/CPUStat.java | 12 -
.../kvm/resource/LibvirtComputingResourceTest.java | 3 -
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 803 ++++---------
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 79 +-
.../resource/XenServerStorageProcessor.java | 30 +-
.../resource/Xenserver625StorageProcessor.java | 10 +-
...itrixCoppyToSecondaryStorageCommandWrapper.java | 43 -
.../xenserver/ExtraConfigurationUtility.java | 180 ---
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 1 -
.../cloudstack/response/HostMetricsResponse.java | 10 -
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
.../cloud/network/element/CiscoVnmcElement.java | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/f5/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../contrail/model/VirtualMachineModel.java | 2 +-
.../contrail/management/NetworkProviderTest.java | 47 +-
plugins/network-elements/juniper-srx/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
.../datastore/provider/DateraHostListener.java | 32 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 2 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 57 +-
plugins/user-authenticators/ldap/pom.xml | 115 +-
.../org/apache/cloudstack/api/LdapConstants.java | 21 -
.../cloudstack/api/command/LdapListUsersCmd.java | 426 +------
.../cloudstack/api/response/LdapUserResponse.java | 90 +-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 102 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 3 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 96 +-
.../cloudstack/ldap/LdapUserManagerFactory.java | 2 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 75 +-
.../ldap/dao/LdapConfigurationDaoImpl.java | 2 +-
.../api/command/LdapListUsersCmdTest.java | 466 --------
.../apache/cloudstack/ldap/EmbeddedLdapServer.java | 326 ------
.../cloudstack/ldap/LdapAuthenticatorTest.java | 60 +-
.../cloudstack/ldap/LdapConfigurationTest.java | 103 +-
.../ldap/LdapDirectoryServerConnectionTest.java | 210 ----
.../apache/cloudstack/ldap/LdapTestConfigTool.java | 48 -
.../ldap/LdapUnboundidZapdotConnectionTest.java | 89 --
.../cloudstack/ldap/LdapUnitConnectionTest.java | 62 -
.../ldap/LdapUserManagerFactoryTest.java | 73 --
.../ldap/src/test/resources/ldapunit.ldif | 151 ---
.../ldap/src/test/resources/log4j.xml | 78 --
.../ldap/src/test/resources/minimal.ldif | 243 ----
.../ldap/src/test/resources/testContext.xml | 37 -
.../ldap/src/test/resources/unboundid.ldif | 311 -----
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
pom.xml | 2 +-
quickcloud/pom.xml | 2 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 280 ++---
scripts/storage/secondary/createtmplt.sh | 1 +
scripts/vm/hypervisor/vmware/discover_networks.py | 288 -----
scripts/vm/hypervisor/xenserver/vmops | 30 +-
scripts/vm/network/security_group.py | 47 +-
scripts/vm/network/vnet/modifyvlan.sh | 9 +-
scripts/vm/systemvm/injectkeys.sh | 2 +-
server/pom.xml | 2 +-
.../manager/allocator/impl/FirstFitAllocator.java | 8 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 23 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 162 +--
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 1 -
.../consoleproxy/ConsoleProxyManagerImpl.java | 2 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 64 +-
.../java/com/cloud/ha/dao/HighAvailabilityDao.java | 2 -
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 17 -
.../kvm/discoverer/LibvirtServerDiscoverer.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 6 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 74 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 3 -
.../network/firewall/FirewallManagerImpl.java | 9 +-
.../cloud/network/router/NetworkHelperImpl.java | 6 +-
.../router/VirtualNetworkApplianceManager.java | 43 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 754 +-----------
.../router/VpcVirtualNetworkApplianceManager.java | 9 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 83 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 1 -
.../network/security/SecurityGroupManagerImpl.java | 33 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 18 +-
.../com/cloud/resource/ResourceManagerImpl.java | 208 ++--
.../resourcelimit/ResourceLimitManagerImpl.java | 52 +-
.../com/cloud/server/ConfigurationServerImpl.java | 6 +-
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../main/java/com/cloud/server/StatsCollector.java | 20 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 30 +-
.../storage/snapshot/SnapshotManagerImpl.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 6 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 509 ++------
.../cloudstack/diagnostics/DiagnosticsHelper.java | 80 --
.../diagnostics/DiagnosticsServiceImpl.java | 406 +------
.../fileprocessor/DiagnosticsFilesList.java | 47 -
.../fileprocessor/DiagnosticsFilesListFactory.java | 36 -
.../DomainRouterDiagnosticsFiles.java | 52 -
.../fileprocessor/SystemVMDiagnosticsFiles.java | 50 -
.../diagnostics/to/DiagnosticsDataObject.java | 97 --
.../diagnostics/to/DiagnosticsDataTO.java | 60 -
.../apache/cloudstack/storage/NfsMountManager.java | 23 -
.../cloudstack/storage/NfsMountManagerImpl.java | 203 ----
.../apache/cloudstack/vm/VmImportManagerImpl.java | 1216 --------------------
.../core/spring-server-core-managers-context.xml | 8 -
.../spring-server-compute-context.xml | 2 -
.../test/java/com/cloud/keystore/KeystoreTest.java | 9 +-
.../cloud/resource/MockResourceManagerImpl.java | 6 +-
.../cloud/resource/ResourceManagerImplTest.java | 248 ++--
.../java/com/cloud/vm/UserVmManagerImplTest.java | 19 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 14 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 11 -
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 5 -
.../DiagnosticsFilesListFactoryTest.java | 83 --
.../diagnostics/DiagnosticsServiceImplTest.java | 92 +-
.../cloudstack/vm/VmImportManagerImplTest.java | 351 ------
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 18 +-
.../storage/template/DownloadManagerImpl.java | 42 +-
setup/dev/advdualzone.cfg | 377 ------
systemvm/debian/etc/logrotate.d/monitor | 24 -
.../debian/etc/logrotate.d/routerServiceMonitor | 24 -
systemvm/debian/opt/cloud/bin/cleanup.sh | 28 -
systemvm/debian/opt/cloud/bin/cs/CsMonitor.py | 68 +-
systemvm/debian/opt/cloud/bin/cs_monitorservice.py | 11 -
.../opt/cloud/bin/getRouterMonitorResults.sh | 55 -
.../debian/opt/cloud/bin/get_diagnostics_files.py | 143 ---
systemvm/debian/opt/cloud/bin/merge.py | 1 -
systemvm/debian/opt/cloud/bin/update_config.py | 6 +-
systemvm/debian/root/health_checks/__init__.py | 20 -
.../debian/root/health_checks/cpu_usage_check.py | 56 -
systemvm/debian/root/health_checks/dhcp_check.py | 69 --
.../debian/root/health_checks/disk_space_check.py | 47 -
systemvm/debian/root/health_checks/dns_check.py | 59 -
.../debian/root/health_checks/gateways_check.py | 57 -
.../debian/root/health_checks/haproxy_check.py | 134 ---
.../debian/root/health_checks/iptables_check.py | 81 --
.../root/health_checks/memory_usage_check.py | 55 -
.../root/health_checks/router_version_check.py | 83 --
.../debian/root/health_checks/utility/__init__.py | 19 -
.../root/health_checks/utility/sharedFunctions.py | 54 -
systemvm/debian/root/monitorServices.py | 266 ++---
systemvm/pom.xml | 2 +-
.../component/test_acquire_specified_public_ip.py | 486 --------
.../test_protocol_number_security_group.py | 460 --------
.../component/test_resource_count_running_vms.py | 927 ---------------
test/integration/component/test_routers.py | 72 +-
test/integration/plugins/ldap/ldap_test_data.py | 189 ---
test/integration/plugins/ldap/test_ldap.py | 476 --------
test/integration/plugins/test_quota.py | 8 -
test/integration/smoke/test_create_network.py | 291 -----
.../smoke/test_deploy_vm_extra_config_data.py | 542 ---------
test/integration/smoke/test_diagnostics.py | 203 +---
test/integration/smoke/test_global_settings.py | 2 +-
test/integration/smoke/test_host_maintenance.py | 392 +++----
test/pom.xml | 2 +-
tools/apidoc/gen_toc.py | 1 -
tools/apidoc/pom.xml | 2 +-
.../scripts/configure_systemvm_services.sh | 1 -
tools/build/setnextversion.sh | 5 +
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.centos6 | 56 +
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/README.md | 10 +-
tools/docker/init.sh_centos6 | 87 ++
tools/marvin/marvin/codes.py | 8 -
tools/marvin/marvin/lib/base.py | 16 +-
tools/marvin/marvin/lib/common.py | 48 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/pom.xml | 2 +-
ui/css/cloudstack3.css | 4 +-
ui/css/src/scss/components/action-icons.scss | 8 -
ui/index.html | 1 -
ui/l10n/en.js | 22 +-
ui/scripts/accountsWizard.js | 35 +-
ui/scripts/cloudStack.js | 134 +--
ui/scripts/docs.js | 7 +-
ui/scripts/instances.js | 6 +-
ui/scripts/metrics.js | 3 +-
ui/scripts/network.js | 234 +---
ui/scripts/sharedFunctions.js | 1 -
ui/scripts/system.js | 423 +------
ui/scripts/ui-custom/accountsWizard.js | 129 ++-
ui/scripts/ui/widgets/listView.js | 7 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 127 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 14 +-
utils/src/main/java/com/cloud/utils/nio/Link.java | 2 +-
.../main/java/com/cloud/utils/nio/NioServer.java | 2 +-
.../java/com/cloud/utils/ssh/SSHKeysHelper.java | 8 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 24 -
.../utils/imagestore/ImageStoreUtil.java | 30 +-
.../com/cloud/utils/UriUtilsParametrizedTest.java | 158 ---
vmware-base/pom.xml | 2 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 13 -
.../vmware/mo/DistributedVirtualSwitchMO.java | 28 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 12 -
.../hypervisor/vmware/mo/VmwareHypervisorHost.java | 4 -
542 files changed, 4141 insertions(+), 20428 deletions(-)
delete mode 100755 agent/bindir/cloud-guest-tool.in
delete mode 100644
api/src/main/java/com/cloud/network/RouterHealthCheckResult.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/TaggedResources.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/ResponseViewProvider.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/AdminCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/UserCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultsListResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceDiskResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/diagnostics/GetDiagnosticsDataResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmImportService.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesCommand.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsAnswer.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsCommand.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/routing/LoadRouterHealthChecksConfigCommand.java
delete mode 100644
core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageAnswer.java
delete mode 100644
core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
delete mode 100644
core/src/main/java/org/apache/cloudstack/diagnostics/DeleteFileInVrCommand.java
delete mode 100644
core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesAnswer.java
delete mode 100644
core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesCommand.java
delete mode 100644
engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDao.java
delete mode 100644
engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDaoImpl.java
delete mode 100644
engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultVO.java
delete mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java
delete mode 100644
engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql
delete mode 100644
engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
create mode 100755 packaging/centos63/cloud-agent.rc
copy packaging/{centos7 => centos63}/cloud-ipallocator.rc (100%)
copy usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in =>
packaging/centos63/cloud-management.rc (62%)
mode change 100644 => 100755
copy usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in =>
packaging/centos63/cloud-usage.rc (68%)
copy packaging/{centos7 => centos63}/cloud.spec (82%)
copy packaging/{centos7 => centos63}/cloudstack-agent.te (100%)
copy packaging/{centos7 => centos63}/cloudstack-sccs (100%)
copy packaging/{centos7 => centos63}/replace.properties (97%)
copy core/src/main/resources/META-INF/cloudstack/api/module.properties =>
packaging/centos63/rhel7/cloudstack-management.conf (93%)
delete mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyToSecondaryStorageWrapper.java
delete mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCoppyToSecondaryStorageCommandWrapper.java
delete mode 100644
plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java
delete mode 100644
plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/LdapConstants.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/EmbeddedLdapServer.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapTestConfigTool.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnitConnectionTest.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUserManagerFactoryTest.java
delete mode 100644
plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif
delete mode 100755
plugins/user-authenticators/ldap/src/test/resources/log4j.xml
delete mode 100644
plugins/user-authenticators/ldap/src/test/resources/minimal.ldif
delete mode 100644
plugins/user-authenticators/ldap/src/test/resources/testContext.xml
delete mode 100644
plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif
delete mode 100755 scripts/vm/hypervisor/vmware/discover_networks.py
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsHelper.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesList.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesListFactory.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DomainRouterDiagnosticsFiles.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/SystemVMDiagnosticsFiles.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataObject.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataTO.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/storage/NfsMountManager.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/vm/VmImportManagerImpl.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsFilesListFactoryTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmImportManagerImplTest.java
delete mode 100644 setup/dev/advdualzone.cfg
delete mode 100644 systemvm/debian/etc/logrotate.d/monitor
delete mode 100644 systemvm/debian/etc/logrotate.d/routerServiceMonitor
delete mode 100755 systemvm/debian/opt/cloud/bin/cleanup.sh
delete mode 100755 systemvm/debian/opt/cloud/bin/getRouterMonitorResults.sh
delete mode 100755 systemvm/debian/opt/cloud/bin/get_diagnostics_files.py
delete mode 100644 systemvm/debian/root/health_checks/__init__.py
delete mode 100644 systemvm/debian/root/health_checks/cpu_usage_check.py
delete mode 100755 systemvm/debian/root/health_checks/dhcp_check.py
delete mode 100644 systemvm/debian/root/health_checks/disk_space_check.py
delete mode 100644 systemvm/debian/root/health_checks/dns_check.py
delete mode 100644 systemvm/debian/root/health_checks/gateways_check.py
delete mode 100644 systemvm/debian/root/health_checks/haproxy_check.py
delete mode 100644 systemvm/debian/root/health_checks/iptables_check.py
delete mode 100644 systemvm/debian/root/health_checks/memory_usage_check.py
delete mode 100644 systemvm/debian/root/health_checks/router_version_check.py
delete mode 100644 systemvm/debian/root/health_checks/utility/__init__.py
delete mode 100644
systemvm/debian/root/health_checks/utility/sharedFunctions.py
delete mode 100644
test/integration/component/test_acquire_specified_public_ip.py
delete mode 100644
test/integration/component/test_protocol_number_security_group.py
delete mode 100644
test/integration/component/test_resource_count_running_vms.py
delete mode 100644 test/integration/plugins/ldap/ldap_test_data.py
delete mode 100644 test/integration/plugins/ldap/test_ldap.py
delete mode 100644 test/integration/smoke/test_create_network.py
delete mode 100644 test/integration/smoke/test_deploy_vm_extra_config_data.py
create mode 100644 tools/docker/Dockerfile.centos6
create mode 100755 tools/docker/init.sh_centos6
delete mode 100644
utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
