> On May 5, 2014, 10:20 a.m., Santhosh Edukulla wrote: > > Ship It!
I tried to apply the patch on master, however it failed. Please rebase it with master. Following are the erros: [root@cent62-Sanjeev acs-repo]# git apply /root/0002-CLOUDSTACK-6536-Code-cleanup-removing-unnecessary-wa.patch error: patch failed: test/integration/component/test_dynamic_compute_offering.py:44 error: test/integration/component/test_dynamic_compute_offering.py: patch does not apply - sanjeev ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/20891/#review42134 ----------------------------------------------------------- On May 2, 2014, 2:23 p.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/20891/ > ----------------------------------------------------------- > > (Updated May 2, 2014, 2:23 p.m.) > > > Review request for cloudstack, Girish Shilamkar and Santhosh Edukulla. > > > Bugs: CLOUDSTACK-6536 > https://issues.apache.org/jira/browse/CLOUDSTACK-6536 > > > Repository: cloudstack-git > > > Description > ------- > > Also > 1)Modified Imports > 2)Removing white-spaces > 3)Added try catch blocks wherever necessary > > > Diffs > ----- > > test/integration/component/test_add_remove_network.py 3e0e78b > test/integration/component/test_blocker_bugs.py ba2602c > test/integration/component/test_custom_hostname.py 7eeda49 > test/integration/component/test_dynamic_compute_offering.py da43fdf > test/integration/component/test_egress_rules.py f0b98e4 > test/integration/component/test_escalations.py e994579 > test/integration/component/test_netscaler_configs.py 592b351 > test/integration/component/test_netscaler_lb.py 732f0f9 > test/integration/component/test_netscaler_nw_off.py d3f1f9e > test/integration/component/test_network_offering.py b0b6906 > test/integration/component/test_persistent_networks.py deb0d6e > test/integration/component/test_project_resources.py 8f81cf9 > test/integration/component/test_project_usage.py 16ca8c1 > test/integration/component/test_redundant_router_cleanups.py 2220d51 > test/integration/component/test_reset_ssh_keypair.py 307e8dc > test/integration/component/test_resource_limits.py 09d9658 > test/integration/component/test_security_groups.py f5c4727 > test/integration/component/test_stopped_vm.py 6c77679 > test/integration/component/test_tags.py d6b43d9 > test/integration/component/test_templates.py 98b1cbc > test/integration/component/test_usage.py eb92011 > test/integration/component/test_volumes.py a310472 > test/integration/component/test_vpc_network.py 2924b72 > test/integration/component/test_vpc_vm_life_cycle.py 95f46d0 > test/integration/smoke/test_service_offerings.py 3c91859 > test/integration/smoke/test_templates.py 4865ee3 > test/integration/smoke/test_vm_life_cycle.py f114ec9 > test/integration/smoke/test_volumes.py 7f5c4f3 > > Diff: https://reviews.apache.org/r/20891/diff/ > > > Testing > ------- > > Tested with python command. No changes in the actual executing code, only the > improvements and removing unnecessary code. > > > Thanks, > > Gaurav Aradhye > >
