----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/12818/ -----------------------------------------------------------
(Updated July 23, 2013, 6:51 a.m.) Review request for cloudstack, Abhinandan Prateek and Sebastien Goasguen. Changes ------- Update diff to fix applying errors identified by the jenkins build. Repository: cloudstack-git Description ------- Want to merge the latest master with my branch due to the formatting of JS scripts on the master branch. Diffs (updated) ----- agent/pom.xml c2b1502 api/src/com/cloud/agent/api/to/S3TO.java 8a2f09d api/src/com/cloud/dao/EntityManager.java 8e6a438 api/src/com/cloud/network/Networks.java 5aede05 api/src/org/apache/cloudstack/api/BaseCmd.java 1a8fdc7 api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b34dc3e api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java cac9614 api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java 3dfcd05 api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java 52611b8 api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java 7e9b9de api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java 271357d api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java daaf094 api/src/org/apache/cloudstack/context/CallContext.java c98908a api/test/com/cloud/network/NetworksTest.java PRE-CREATION awsapi/pom.xml bcae072 client/tomcatconf/applicationContext.xml.in 9b2b70a client/tomcatconf/nonossComponentContext.xml.in 8371e37 docs/en-US/Common_Content/Legal_Notice.xml d35b5c6 docs/en-US/signing-api-requests.xml fc8773b engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java 2718e2f engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java b75600e engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java 9c009b9 engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java f3f7bad engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java cb1a0d3 engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java bd6980e engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/DiskFormat.java 6be7a6b engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/disktype/VHDX.java PRE-CREATION engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java a533f55 engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java 85c6272 engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java e8f4ce5 engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java 6dc2cd4 engine/api/src/org/apache/cloudstack/storage/command/DettachCommand.java bb7325c engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java 96e18fc engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java 0822b92 engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java 0034419 engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java cdf08cc engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java 65b9db5 engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java 4b4a560 engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java 3c34023 engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java 96fb1d9 engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java cfd2137 engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java f8f25ea engine/schema/src/com/cloud/storage/DiskOfferingVO.java 8cbda14 engine/schema/src/com/cloud/storage/UploadVO.java 63fadfa engine/schema/src/com/cloud/storage/VolumeVO.java bd57f10 engine/schema/src/com/cloud/storage/dao/VolumeDao.java fb7dc70 engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java ba85466 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java e37ccd5 engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java e564052 engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java ec04085 engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b972628 engine/storage/integration-test/pom.xml 8a9dc15 engine/storage/src/org/apache/cloudstack/storage/LocalHostEndpoint.java 060ad6a engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java cd64ab2 engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java f77226d engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java 2f01a27 engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java PRE-CREATION engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 89313e4 packaging/centos63/cloud.spec 97211e4 patches/systemvm/debian/config/etc/ssh/sshd_config 2bcd6e5 patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh f2f8a49 patches/systemvm/debian/config/root/userdata.sh f9ea644 plugins/event-bus/rabbitmq/pom.xml bd4d097 plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java 97b2840 plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java f6cc57f plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java 150e3dc plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsCookie.java PRE-CREATION plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java e9b6644 plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java 4c4d8df plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java f0e9e08 plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 4113803 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 991a890 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java 074375e plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java 3e2cbbe plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java e027ec3 plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java 9c6cf14 plugins/pom.xml 261e8e8 plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java 26733d4 plugins/storage/volume/solidfire/pom.xml 81af8ac pom.xml ff1d3c0 scripts/storage/secondary/createtmplt.sh d16386e scripts/vm/hypervisor/xenserver/setupxenserver.sh 57456b3 scripts/vm/network/security_group.py 044747a server/pom.xml 497e4c9 server/src/com/cloud/agent/manager/AgentAttache.java dbdbd37 server/src/com/cloud/agent/manager/AgentManagerImpl.java 75a77f4 server/src/com/cloud/alert/AlertManagerImpl.java 9b7cd27 server/src/com/cloud/api/ApiDispatcher.java c0b3117 server/src/com/cloud/api/ApiResponseHelper.java c313418 server/src/com/cloud/api/ApiServer.java 5a72e37 server/src/com/cloud/api/ApiServlet.java 2a5ad73 server/src/com/cloud/api/query/QueryManagerImpl.java cef5ddf server/src/com/cloud/api/query/ViewResponseHelper.java 8e69dd1 server/src/com/cloud/async/AsyncJobManagerImpl.java 42ca3ae server/src/com/cloud/capacity/CapacityManagerImpl.java d54624d server/src/com/cloud/cluster/ClusterManagerImpl.java 118de41 server/src/com/cloud/cluster/ManagementServerNode.java fb42318 server/src/com/cloud/configuration/Config.java 8d8c0c4 server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 1035c5c server/src/com/cloud/dao/EntityManagerImpl.java a3ab5b3 server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java ebf2b0c server/src/com/cloud/hypervisor/HypervisorGuruBase.java 769648a server/src/com/cloud/network/NetworkManagerImpl.java 0fa58be server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 66d904c server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 986dd4f server/src/com/cloud/network/security/SecurityGroupManagerImpl.java d4460f1 server/src/com/cloud/resource/ResourceManagerImpl.java d7652f4 server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 5a9d360 server/src/com/cloud/storage/StorageManagerImpl.java 2b57bae server/src/com/cloud/storage/VolumeManagerImpl.java a8a3e1a server/src/com/cloud/storage/download/DownloadMonitorImpl.java 2b1aa4e server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java 9408d48 server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java ddba735 server/src/com/cloud/template/TemplateManagerImpl.java c7cc818 server/src/com/cloud/user/DomainManagerImpl.java c862061 server/src/com/cloud/vm/UserVmManagerImpl.java 674f29c server/src/com/cloud/vm/VirtualMachineGuru.java 3141507 server/src/com/cloud/vm/VirtualMachineManager.java 6320956 server/src/com/cloud/vm/VirtualMachineManagerImpl.java 6fb2379 server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java 38ba37c server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java 071f658 server/test/com/cloud/vm/MockUserVmManagerImpl.java 9b1d3f3 server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java 14ef48b server/test/com/cloud/vm/VirtualMachineManagerImplTest.java 44e22e2 server/test/resources/VpcVirtNetAppContext.xml f8a8aa4 services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 054edd9 setup/db/db/schema-410to420.sql cdb45a1 test/integration/component/test_accounts.py 65c0c6f test/integration/component/test_affinity_groups.py be93827 test/integration/component/test_netscaler_nw_off.py 6a51666 test/integration/component/test_project_usage.py bb253e1 test/integration/component/test_projects.py 39e9bee test/integration/component/test_redundant_router.py 5f7b1ca test/integration/component/test_redundant_router_deployment_planning.py 5f06794 test/integration/component/test_vpc.py 63c10aa test/integration/component/test_vpc_network.py d76996a test/integration/component/test_vpc_network_lbrules.py 2712dac test/integration/smoke/test_affinity_groups.py e63b916 test/integration/smoke/test_loadbalance.py 7bf560c tools/devcloud-kvm/devcloud-kvm-advanced.cfg 10cbce0 tools/devcloud-kvm/devcloud-kvm.cfg 9f310e3 tools/marvin/marvin/cloudstackTestCase.py 114928c tools/marvin/marvin/cloudstackTestClient.py ea32b90 tools/marvin/marvin/codegenerator.py 632b8c6 tools/marvin/marvin/deployDataCenter.py 100f442 tools/marvin/marvin/integration/lib/base.py 161d03c tools/marvin/marvin/integration/lib/utils.py 4eca8ba tools/marvin/marvin/marvinPlugin.py 5014a2c ui/scripts/accounts.js bad8435 ui/scripts/affinity.js a9c6695 ui/scripts/autoscaler.js 15a9dac ui/scripts/cloud.core.callbacks.js 6eb7644 ui/scripts/cloudStack.js c0ff7f2 ui/scripts/configuration.js 8bc40d6 ui/scripts/dashboard.js e8ab6c5 ui/scripts/docs.js c8ef0d9 ui/scripts/domains.js 01f4236 ui/scripts/events.js bd50887 ui/scripts/installWizard.js 46769fa ui/scripts/instanceWizard.js ff130d3 ui/scripts/instances.js 9b27d93 ui/scripts/lbStickyPolicy.js c0e2bfa ui/scripts/network.js 95a93bc ui/scripts/plugins.js 3c5bc0f ui/scripts/projects.js ea1e6db ui/scripts/regions.js 4be600f ui/scripts/sharedFunctions.js a9f833c ui/scripts/storage.js ad0965a ui/scripts/system.js 3038a8a ui/scripts/templates.js dbb0083 ui/scripts/ui-custom/affinity.js 1a23ff7 ui/scripts/ui-custom/autoscaler.js 2f6ce38 ui/scripts/ui-custom/dashboard.js 6d92318 ui/scripts/ui-custom/enableStaticNAT.js 1b2bf7b ui/scripts/ui-custom/granularSettings.js 02d5c1f ui/scripts/ui-custom/healthCheck.js 4b42fa7 ui/scripts/ui-custom/installWizard.js c53a642 ui/scripts/ui-custom/instanceWizard.js 31b4baa ui/scripts/ui-custom/ipRules.js 34b2398 ui/scripts/ui-custom/login.js 0dbbf82 ui/scripts/ui-custom/physicalResources.js 5173172 ui/scripts/ui-custom/pluginListing.js 3dcce98 ui/scripts/ui-custom/projectSelect.js aef49ed ui/scripts/ui-custom/projects.js f1f9eba ui/scripts/ui-custom/recurringSnapshots.js 985f369 ui/scripts/ui-custom/regions.js 9fc36f3 ui/scripts/ui-custom/securityRules.js 2e2c9ac ui/scripts/ui-custom/uploadVolume.js 996d8ac ui/scripts/ui-custom/vpc.js 4edccf1 ui/scripts/ui-custom/zoneChart.js 5d4e0c0 ui/scripts/ui-custom/zoneFilter.js 9e6a493 ui/scripts/ui-custom/zoneWizard.js 877dbc0 ui/scripts/ui/core.js 18c3363 ui/scripts/ui/dialog.js 7f82eea ui/scripts/ui/events.js bd609d2 ui/scripts/ui/utils.js 39ef3e3 ui/scripts/ui/widgets/cloudBrowser.js 9a56bb3 ui/scripts/ui/widgets/dataTable.js 1b3ea82 ui/scripts/ui/widgets/detailView.js 0bccef5 ui/scripts/ui/widgets/listView.js bc68a72 ui/scripts/ui/widgets/multiEdit.js 08bd0bf ui/scripts/ui/widgets/notifications.js 0299603 ui/scripts/ui/widgets/overlay.js ecf12e6 ui/scripts/ui/widgets/tagger.js 9af6fb7 ui/scripts/ui/widgets/toolTip.js 6967acc ui/scripts/ui/widgets/treeView.js fa1ceb6 ui/scripts/vm_snapshots.js c50c7e1 ui/scripts/vpc.js e90d8a7 ui/scripts/zoneWizard.js 04687fe usage/pom.xml e35d0eb utils/conf/db.properties 903cf71 utils/pom.xml f4ac12b utils/src/com/cloud/utils/EnumUtils.java 807964b utils/src/com/cloud/utils/MethodCapturer.java PRE-CREATION utils/src/com/cloud/utils/Predicate.java PRE-CREATION utils/src/com/cloud/utils/SerialVersionUID.java 856d563 utils/src/com/cloud/utils/StringUtils.java db32dd4 utils/src/com/cloud/utils/component/ComponentContext.java 5c5194c utils/src/com/cloud/utils/component/ComponentLifecycleBase.java 8c7d09d utils/src/com/cloud/utils/db/Condition.java 55b19d8 utils/src/com/cloud/utils/db/EntityManager.java PRE-CREATION utils/src/com/cloud/utils/db/FirstWhere.java 46551e9 utils/src/com/cloud/utils/db/GenericDao.java 3efc1c5 utils/src/com/cloud/utils/db/GenericDaoBase.java f0fc700 utils/src/com/cloud/utils/db/GenericSearchBuilder.java 337d444 utils/src/com/cloud/utils/db/JoinQueryBuilder.java 090a1d1 utils/src/com/cloud/utils/db/NextWhere.java 0d65ae4 utils/src/com/cloud/utils/db/On.java 6965f4d utils/src/com/cloud/utils/db/QueryBuilder.java 3303fbd utils/src/com/cloud/utils/db/SearchCriteria.java 85f7708 utils/src/com/cloud/utils/db/Select.java d82d1fa utils/src/com/cloud/utils/db/SelectQueryBuilder.java 82ba134 utils/src/com/cloud/utils/db/SimpleQueryBuilder.java 9e446d2 utils/src/com/cloud/utils/db/Where.java 6815f24 utils/src/com/cloud/utils/exception/CloudRuntimeException.java cea3ac2 utils/src/com/cloud/utils/script/Executor.java 4e70a77 utils/src/com/cloud/utils/script/Script.java d3a3591 utils/src/com/cloud/utils/script/ScriptBuilder.java 96cadfb utils/src/org/apache/cloudstack/config/ConfigDepot.java PRE-CREATION utils/src/org/apache/cloudstack/config/ConfigKey.java PRE-CREATION utils/src/org/apache/cloudstack/config/ConfigValue.java PRE-CREATION utils/src/org/apache/cloudstack/config/Configuration.java PRE-CREATION utils/src/org/apache/cloudstack/test/utils/SpringUtils.java fc54dfb utils/src/org/apache/cloudstack/utils/identity/ManagementServerNode.java PRE-CREATION utils/test/com/cloud/utils/StringUtilsTest.java 796efba utils/test/org/apache/cloudstack/test/utils/SpringUtils.java PRE-CREATION vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java 7c548ff vmware-base/src/com/cloud/hypervisor/vmware/mo/HostStorageSystemMO.java d400185 Diff: https://reviews.apache.org/r/12818/diff/ Testing ------- Successfully applied the patch Successfully complied/Passed unit tests Thanks, Ian Duffy
