cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Chip Childers" <chip.child...@sungard.com>
Subject Re: Review Request: CLOUDSTACK-1664 and 1558 Fix ActionEvent interception and optimize DB annotation lookup with caching
Date Tue, 19 Mar 2013 17:02:05 GMT

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/10001/#review18083
-----------------------------------------------------------


This patch does not apply to the 4.1 branch:

# git am ~/Downloads/0001-CLOUDSTACK-1568-CLOUDSTACK-1664-Fix-ActionEvent-inte.patch
Applying: CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup
with caching
/Users/chip.childers/incubator-cloudstack/.git/rebase-apply/patch:28: space before tab in
indent.
        	guardUserInput(map);
/Users/chip.childers/incubator-cloudstack/.git/rebase-apply/patch:33: trailing whitespace.
    
/Users/chip.childers/incubator-cloudstack/.git/rebase-apply/patch:35: space before tab in
indent.
    	map.remove("host");
/Users/chip.childers/incubator-cloudstack/.git/rebase-apply/patch:36: space before tab in
indent.
    	map.remove("port");
/Users/chip.childers/incubator-cloudstack/.git/rebase-apply/patch:37: space before tab in
indent.
    	map.remove("tag");
error: patch failed: utils/src/com/cloud/utils/component/SpringComponentScanUtils.java:38
error: utils/src/com/cloud/utils/component/SpringComponentScanUtils.java: patch does not apply
Patch failed at 0001 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize
@DB lookup with caching
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 March 19, 2013, 5:01 p.m., Kelven Yang wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/10001/
> -----------------------------------------------------------
> 
> (Updated March 19, 2013, 5:01 p.m.)
> 
> 
> Review request for cloudstack and Chip Childers.
> 
> 
> Description
> -------
> 
> Fix ActionEvent interception and optimize DB annotation lookup with caching
> 
> 
> This addresses bugs CLOUDSTACK-1558 and CLOUDSTACK-1664.
> 
> 
> Diffs
> -----
> 
> 
> Diff: https://reviews.apache.org/r/10001/diff/
> 
> 
> Testing
> -------
> 
> Low-level changes, tested manually
> 
> 
> Thanks,
> 
> Kelven Yang
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message