----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/10254/#review18654 -----------------------------------------------------------
Ship it!!!!!! But there's probably a note here to those working on Windows to set the right git autocrlf to prevent more such ^M chars. - Prasanna Santhanam On April 3, 2013, 4:58 p.m., Brian Spindler wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/10254/ > ----------------------------------------------------------- > > (Updated April 3, 2013, 4:58 p.m.) > > > Review request for cloudstack. > > > Description > ------- > > Patch with all ^M's removed from java code. There are no functionality > changes. > > > This addresses bug CLOUDSTACK-1909. > > > Diffs > ----- > > > engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java > 99f3120 > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java > 216cfa8 > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java > 3e81a44 > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java > 0811f0b > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java > 2124a81 > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java > 3e5174b > > engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java > 7170f00 > engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java > 5dbe0c6 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java > a36ca3a > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java > 508b0b9 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java > c367ee9 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java > 4fe6718 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java > a0aa264 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java > 535290b > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java > a1cca3f > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java > cbad9ab > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java > d01bf2f > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java > 6037ad4 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java > baa0920 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java > 378f16d > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java > a312578 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java > dc346cc > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java > 5a4c2be > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java > 60ea547 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java > d6a9fe2 > > engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java > 4b1b1e6 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java > 3471b7a > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java > ab1cbe6 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java > 3cfca3b > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java > b4a2080 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java > 5c66a21 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java > 333a220 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java > c4f1940 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java > 24e01a0 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java > 15bed6f > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java > fe1b832 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java > 99c9540 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java > 3983dd9 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java > a27ed50 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java > 48e7773 > > engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java > c5b4bd2 > > engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java > 83e78b4 > > engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java > a3ef276 > > framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java > 998bfa0 > > framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java > 55debd9 > > framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java > 074d60f > > framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java > 8b62212 > framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java > 7094fb0 > > framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java > 8869b21 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/AddBaremetalHostCmd.java > f07b212 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java > 28c8375 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java > 6467c94 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalPlannerSelector.java > 9daee3f > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalKickStartPxeCmd.java > 596a86d > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java > 4c99f6b > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java > bec6e38 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java > 58c6e86 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java > 8a5ac78 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java > 64f22e0 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java > 6288f91 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java > 3d9f581 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java > 25dfeb7 > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java > 7ad351c > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java 581096d > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java > ae0980c > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java a8c6fd7 > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java > 84fe29c > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java > 39f9782 > plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java > cd8371b > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AddUcsManagerCmd.java > ce8e40e > > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AssociateUcsProfileToBladeCmd.java > c463828 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsBladeCmd.java > 5440e4f > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsManagerCmd.java > 862f631 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsProfileCmd.java > c8a2cc5 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java > 72bbfcb > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsBladeResponse.java > 862b206 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java eb99991 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java > 5c60601 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java aa45f8c > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java > f428e03 > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerResponse.java > 6a82dae > plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsProfileResponse.java > 0621f6f > plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java > e3b1cfd > plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java 16cf35d > > plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java > 907e8e7 > server/src/com/cloud/async/AsyncJobManagerImpl.java 438877b > server/src/com/cloud/async/SyncQueueManager.java a7032da > server/src/com/cloud/async/SyncQueueManagerImpl.java aaa4c9b > server/src/com/cloud/async/dao/SyncQueueDao.java 816f9dd > server/src/com/cloud/async/dao/SyncQueueItemDao.java 6b9da8b > server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java > d5f04ac > server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java 03e8774 > server/src/com/cloud/deploy/DeployPlannerSelector.java 40eabb1 > server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java 0f454cd > server/src/com/cloud/ha/UserVmDomRInvestigator.java f86932a > server/src/com/cloud/host/dao/HostDao.java 4760035 > server/src/com/cloud/network/as/AutoScaleManager.java ac822dc > server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java > 88755bb > server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java > cacebf0 > server/src/com/cloud/network/as/dao/AutoScalePolicyDao.java 51b2a94 > server/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java 05dbf31 > server/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java a11bedd > server/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java ae4ab2c > server/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java > b0d064e > server/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java d97e848 > server/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java 99c3cc2 > server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java dfa6a2e > server/src/com/cloud/storage/StorageManager.java 9213b4b > server/src/com/cloud/storage/dao/VMTemplateDao.java c39626f > server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b51b216 > server/src/com/cloud/upgrade/dao/Upgrade30xBase.java 36ae3c5 > server/src/com/cloud/vm/dao/UserVmDaoImpl.java 4922828 > server/test/com/cloud/async/TestSyncQueueManager.java 2322aec > > server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java > 5969948 > server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java 128a62c > server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java > de0a4ed > server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java a238e52 > server/test/com/cloud/vpc/VpcTestConfiguration.java e250cd1 > utils/src/com/cloud/utils/component/SpringComponentScanUtils.java 9a85c79 > utils/src/com/cloud/utils/xmlobject/XmlObject.java 80ac13d > utils/src/com/cloud/utils/xmlobject/XmlObjectParser.java af62bed > utils/test/com/cloud/utils/xmlobject/TestXmlObject.java c2bcd02 > utils/test/com/cloud/utils/xmlobject/TestXmlObject2.java 9bde687 > > Diff: https://reviews.apache.org/r/10254/diff/ > > > Testing > ------- > > Built on Ubuntu 12.04 without issue. > [INFO] Reactor Summary: > [INFO] > [INFO] Apache CloudStack ................................. SUCCESS [1.532s] > [INFO] Apache CloudStack Utils ........................... SUCCESS [9.527s] > [INFO] Apache CloudStack API ............................. SUCCESS [7.672s] > [INFO] Apache CloudStack Framework ....................... SUCCESS [0.049s] > [INFO] cloud-framework-api ............................... SUCCESS [1.437s] > [INFO] Apache CloudStack Framework - REST ................ SUCCESS [2.213s] > [INFO] Apache CloudStack Cloud Engine .................... SUCCESS [0.044s] > [INFO] Apache CloudStack Cloud Engine API ................ SUCCESS [3.002s] > [INFO] Apache CloudStack Core ............................ SUCCESS [4.054s] > [INFO] Apache CloudStack Agents .......................... SUCCESS [4.937s] > [INFO] Apache CloudStack Framework - Event Notification .. SUCCESS [1.480s] > [INFO] Apache CloudStack Server .......................... SUCCESS [13.891s] > [INFO] Apache CloudStack Usage Server .................... SUCCESS [3.330s] > [INFO] Apache XenSource XAPI ............................. SUCCESS [3.218s] > [INFO] Apache CloudStack Framework - IPC ................. SUCCESS [2.609s] > [INFO] Apache CloudStack Cloud Engine Internal Components API SUCCESS > [1.702s] > [INFO] Apache CloudStack Cloud Engine Compute Component .. SUCCESS [1.604s] > [INFO] Apache CloudStack Cloud Engine Orchestration Component SUCCESS > [3.024s] > [INFO] Apache CloudStack Engine Storage Component ........ SUCCESS [2.631s] > [INFO] Apache CloudStack Engine Storage Volume Component . SUCCESS [2.597s] > [INFO] Apache CloudStack Engine Storage Image Component .. SUCCESS [1.846s] > [INFO] Apache CloudStack Engine Storage Image Motion Component SUCCESS > [1.730s] > [INFO] Apache CloudStack Engine Storage Backup Component . SUCCESS [1.630s] > [INFO] Apache CloudStack Engine Storage Snapshot Component SUCCESS [2.800s] > [INFO] Apache CloudStack Plugin POM ...................... SUCCESS [0.329s] > [INFO] Apache CloudStack Plugin - Open vSwitch ........... SUCCESS [1.921s] > [INFO] Apache CloudStack Plugin - Hypervisor Xen ......... SUCCESS [4.887s] > [INFO] Apache CloudStack Engine Storage integration test Component SUCCESS > [2.003s] > [INFO] Apache CloudStack Cloud Engine Schema Component ... SUCCESS [0.804s] > [INFO] Apache CloudStack Cloud Engine API ................ SUCCESS [1.536s] > [INFO] Apache CloudStack Cloud Engine Service ............ SUCCESS [3.375s] > [INFO] Apache CloudStack Plugin - API Rate Limit ......... SUCCESS [4.604s] > [INFO] Apache CloudStack Plugin - API Discovery .......... SUCCESS [2.790s] > [INFO] Apache CloudStack Plugin - ACL Static Role Based .. SUCCESS [1.828s] > [INFO] Apache CloudStack Plugin - User Concentrated Pod Deployment Planner > SUCCESS [1.736s] > [INFO] Apache CloudStack Plugin - User Dispersing Deployment Planner SUCCESS > [1.968s] > [INFO] Apache CloudStack Plugin - Host Allocator Random .. SUCCESS [1.607s] > [INFO] Apache CloudStack Plugin - Hypervisor OracleVM .... SUCCESS [2.311s] > [INFO] Apache CloudStack Plugin - Hypervisor KVM ......... SUCCESS [4.687s] > [INFO] Apache CloudStack Plugin - RabbitMQ Event Bus ..... SUCCESS [1.818s] > [INFO] Apache CloudStack Plugin - Hypervisor Simulator ... SUCCESS [2.565s] > [INFO] Apache CloudStack Plugin - Hypervisor Baremetal ... SUCCESS [2.580s] > [INFO] Apache CloudStack Plugin - Hypervisor UCS ......... SUCCESS [1.963s] > [INFO] Apache CloudStack Plugin - Network Elastic Load Balancer SUCCESS > [2.036s] > [INFO] Apache CloudStack Plugin - Network Nicira NVP ..... SUCCESS [4.724s] > [INFO] Apache CloudStack Plugin - BigSwitch Virtual Network Segment SUCCESS > [3.566s] > [INFO] Apache CloudStack Plugin - Midokura Midonet ....... SUCCESS [3.913s] > [INFO] Apache CloudStack Plugin - Storage Allocator Random SUCCESS [1.994s] > [INFO] Apache CloudStack Plugin - User Authenticator LDAP SUCCESS [1.721s] > [INFO] Apache CloudStack Plugin - User Authenticator MD5 . SUCCESS [1.869s] > [INFO] Apache CloudStack Plugin - User Authenticator Plain Text SUCCESS > [1.731s] > [INFO] Apache CloudStack Plugin - User Authenticator SHA256 Salted SUCCESS > [2.902s] > [INFO] Apache CloudStack Plugin - Dns Notifier Example ... SUCCESS [1.740s] > [INFO] Apache CloudStack Plugin - Storage Image S3 ....... SUCCESS [0.941s] > [INFO] Apache CloudStack Plugin - Storage Volume solidfire SUCCESS [2.463s] > [INFO] Apache CloudStack Plugin - Storage Volume default provider SUCCESS > [1.754s] > [INFO] Apache CloudStack Plugin - SNMP Alerts ............ SUCCESS [16.233s] > [INFO] Apache CloudStack Plugin - Syslog Alerts .......... SUCCESS [2.596s] > [INFO] Apache CloudStack SystemVM Patches ................ SUCCESS [0.215s] > [INFO] Apache CloudStack Cloud Services .................. SUCCESS [0.026s] > [INFO] Apache CloudStack Console Proxy Service ........... SUCCESS [0.025s] > [INFO] Apache CloudStack Console Proxy Plugin ............ SUCCESS [0.024s] > [INFO] Apache CloudStack Console Proxy ................... SUCCESS [20.168s] > [INFO] Apache CloudStack Test ............................ SUCCESS [2.992s] > [INFO] Apache CloudStack Client UI ....................... SUCCESS [4.082s] > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 3:23.029s > [INFO] Finished at: Wed Apr 03 09:53:14 PDT 2013 > [INFO] Final Memory: 54M/1040M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Brian Spindler > >