-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/11894/#review21999
-----------------------------------------------------------
I get the following conflicts when attempting to apply this:
git am ~/patches/11894.patch
Applying: removed 3 NumbersUtils methods
/home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:1152: space before
tab in indent.
_numRetries = NumberUtils.toInt((String)
params.get("numretries"), 1);
/home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:1735: space before
tab in indent.
_clusterRequestTimeoutSeconds = NumberUtils.toInt(value,
DEFAULT_REQUEST_TIMEOUT);
/home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:2689: space before
tab in indent.
_capacityPerSSVM =
NumberUtils.toInt(_configDao.getValue(Config.SecStorageSessionMax.key()),
DEFAULT_SS_VM_CAPACITY);
/home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:3199: space before
tab in indent.
int ramSize =
NumberUtils.toInt(_configDao.getValue("ssvm.ram.size"), DEFAULT_SS_VM_RAMSIZE);
/home/sg-user/incubator-cloudstack/.git/rebase-apply/patch:3200: space before
tab in indent.
int cpuFreq =
NumberUtils.toInt(_configDao.getValue("ssvm.cpu.mhz"), DEFAULT_SS_VM_CPUMHZ);
error: patch failed:
plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java:25
error:
plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java:
patch does not apply
error: patch failed:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java:41
error: server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java: patch
does not apply
Patch failed at 0001 removed 3 NumbersUtils methods
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
- Chip Childers
On June 15, 2013, 9:29 p.m., Laszlo Hornyak wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/11894/
> -----------------------------------------------------------
>
> (Updated June 15, 2013, 9:29 p.m.)
>
>
> Review request for cloudstack.
>
>
> Description
> -------
>
> Removed parseInt, parseLong and parseFloat and replaced with calls to
> commons-lang NumberUtils
>
>
> Diffs
> -----
>
> agent/src/com/cloud/agent/AgentShell.java cf454b8
> agent/src/com/cloud/agent/VmmAgentShell.java 190d116
> agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
> 991764c
>
> core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
> dae1c85
> core/src/com/cloud/storage/template/TemplateLocation.java 58d023a
>
> engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
> f99bc6c
> engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java 4d9d010
> engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java 2ef842a
>
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnapshotStrategy.java
> 4aba3d9
>
> engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
> 5326701
>
> engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java
> 632ba43
>
> engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
> a6880c3
>
> plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java
> 6c3f57f
>
> plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
> c321b22
>
> plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
> be016cb
>
> plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
> 2b0b158
>
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
> b897df2
>
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> f90edd8
>
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
> eac3248
>
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
> a604392
>
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
> 4ae0f30
>
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
> 5b6b546
>
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> 5e8283a
>
> plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java
> 9524bf9
>
> plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
> b21e8f9
>
> plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
> 80b42e0
>
> plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
> 1733712
>
> plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
> c00d99a
>
> plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
> fd065d5
>
> plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java
> 3c7c23d
>
> plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
> 13a6900
>
> plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
> 263e13b
>
> plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
> fb37e8f
> server/src/com/cloud/agent/manager/AgentManagerImpl.java 6baeecf
> server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java 3ce60b7
> server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
> b6286aa
>
> server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
> 29e1be9
> server/src/com/cloud/alert/AlertManagerImpl.java 9b7cd27
> server/src/com/cloud/api/ApiDBUtils.java e5fa2e1
> server/src/com/cloud/api/ApiServer.java 0cd1d61
> server/src/com/cloud/async/AsyncJobManagerImpl.java 0101a8a
> server/src/com/cloud/capacity/CapacityManagerImpl.java e58ae40
> server/src/com/cloud/cluster/ClusterManagerImpl.java 118de41
> server/src/com/cloud/cluster/ClusterServiceServletAdapter.java 04026d30
> server/src/com/cloud/configuration/ConfigurationManagerImpl.java 131d340
> server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
> df53e0d
> server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 7362cf1
> server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java 7b59a6b
> server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java eb895e5
> server/src/com/cloud/deploy/FirstFitPlanner.java 7124de2
> server/src/com/cloud/ha/HighAvailabilityManagerImpl.java 25c5a04
> server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java 9b190aa
> server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
> 829ad3f
> server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
> 2c8031c
> server/src/com/cloud/network/Ipv6AddressManagerImpl.java a401f9a
> server/src/com/cloud/network/NetworkManagerImpl.java d6a6450
> server/src/com/cloud/network/NetworkServiceImpl.java f026dbc
> server/src/com/cloud/network/NetworkUsageManagerImpl.java 80f898b
> server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java 62b738b
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
> 8da5176
> server/src/com/cloud/network/security/SecurityGroupManagerImpl.java 1c189c4
> server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
> a42881e
> server/src/com/cloud/network/vpc/VpcManagerImpl.java b41003a
> server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java 9e7bb13
> server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java a24300e
> server/src/com/cloud/projects/ProjectManagerImpl.java 7ab385f
> server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 6d929c6
> server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java
> 8658113
> server/src/com/cloud/server/ManagementServerImpl.java 96c72e4
> server/src/com/cloud/server/StatsCollector.java 8d84c6c
> server/src/com/cloud/storage/StorageManagerImpl.java d38b35e
> server/src/com/cloud/storage/VolumeManagerImpl.java 4297efb
> server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
> c343286
> server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 02e3428
> server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java 4696bb5
> server/src/com/cloud/storage/upload/UploadMonitorImpl.java 31f3e74
> server/src/com/cloud/template/TemplateManagerImpl.java 517d4ba
> server/src/com/cloud/user/AccountManagerImpl.java 6b4bf0e
> server/src/com/cloud/vm/UserVmManagerImpl.java 1c8ab75
> server/src/com/cloud/vm/VirtualMachineManagerImpl.java f946cd1
> server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java 8687163
>
> services/secondary-storage/src/org/apache/cloudstack/storage/resource/CifsSecondaryStorageResource.java
> de4cfe0
>
> services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
> e7fa5b2
>
> services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
> a9d23cb
>
> services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java
> 88623a9
> usage/src/com/cloud/usage/UsageAlertManagerImpl.java dc918b8
> utils/src/com/cloud/utils/NumbersUtil.java d9b06b7
> utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java 976e369
> utils/src/com/cloud/utils/crypt/EncryptionSecretKeySender.java 2dc865c
> utils/src/com/cloud/utils/db/GenericDaoBase.java f0fc700
>
> Diff: https://reviews.apache.org/r/11894/diff/
>
>
> Testing
> -------
>
> recompiled and ran
>
>
> Thanks,
>
> Laszlo Hornyak
>
>
