----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/29246/#review65733 -----------------------------------------------------------
doesn't apply cleanly on master: git am -3s /Users/talluri/Downloads/0001-CLOUDSTACK-8099-Fixed-missing-import-in-test_dynamic.patch Applying: CLOUDSTACK-8099: Fixed missing import in test_dynamic_compute_offering.py Using index info to reconstruct a base tree... M test/integration/component/test_dynamic_compute_offering.py Falling back to patching base and 3-way merge... Auto-merging test/integration/component/test_dynamic_compute_offering.py CONFLICT (content): Merge conflict in test/integration/component/test_dynamic_compute_offering.py Failed to merge in the changes. Patch failed at 0001 CLOUDSTACK-8099: Fixed missing import in test_dynamic_compute_offering.py The copy of the patch that failed is found in: /Users/talluri/asf/cloudstack/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. - SrikanteswaraRao Talluri On Dec. 19, 2014, 12:56 p.m., Ashutosh Kelkar wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/29246/ > ----------------------------------------------------------- > > (Updated Dec. 19, 2014, 12:56 p.m.) > > > Review request for cloudstack and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-8099 > https://issues.apache.org/jira/browse/CLOUDSTACK-8099 > > > Repository: cloudstack-git > > > Description > ------- > > Fixed the missing unittest import and pep8 issues. > > > Diffs > ----- > > test/integration/component/test_dynamic_compute_offering.py d96fd84 > > Diff: https://reviews.apache.org/r/29246/diff/ > > > Testing > ------- > > Tested with python command and pylint. > > > Thanks, > > Ashutosh Kelkar > >
