You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Daan Hoogland <da...@gmail.com> on 2014/04/25 21:48:17 UTC
Re: [ACS4.4] cherry pick
On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi
<Ra...@citrix.com> wrote:
> f7f84fba89cf9eea856075d45bf623ff9ed7a632
doesn't apply cleanly
--
Daan
Re: [ACS4.4] cherry pick
Posted by Rajani Karuturi <Ra...@citrix.com>.
Hi Daan,
The actual commit was 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b.
However there were some check style issues(tab spacing related) as the commit was originally created for 4.3
Those were fixed in the commit f7f84fba89cf9eea856075d45bf623ff9ed7a632
The request was to cherry-pick both the commits to avoid check style errors in 4.4
I see that both are in 4.4. Thanks
~Rajani
On 26-Apr-2014, at 2:20 am, Daan Hoogland <da...@gmail.com> wrote:
> Rajani, I guess I did not understand your mail. I applied the first
> mentioned/second applied patch and it is pushed.
>
> 2014-04-25 22:27 GMT+02:00 Daan Hoogland <da...@gmail.com>:
>> 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b
>>
>> picked
>>
>> On Fri, Apr 25, 2014 at 9:48 PM, Daan Hoogland <da...@gmail.com> wrote:
>>> On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi
>>> <Ra...@citrix.com> wrote:
>>>> f7f84fba89cf9eea856075d45bf623ff9ed7a632
>>>
>>>
>>> doesn't apply cleanly
>>>
>>> --
>>> Daan
>>
>>
>>
>> --
>> Daan
>
>
>
> --
> Daan
Re: [ACS4.4] cherry pick
Posted by Daan Hoogland <da...@gmail.com>.
Rajani, I guess I did not understand your mail. I applied the first
mentioned/second applied patch and it is pushed.
2014-04-25 22:27 GMT+02:00 Daan Hoogland <da...@gmail.com>:
> 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b
>
> picked
>
> On Fri, Apr 25, 2014 at 9:48 PM, Daan Hoogland <da...@gmail.com> wrote:
>> On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi
>> <Ra...@citrix.com> wrote:
>>> f7f84fba89cf9eea856075d45bf623ff9ed7a632
>>
>>
>> doesn't apply cleanly
>>
>> --
>> Daan
>
>
>
> --
> Daan
--
Daan
Re: [ACS4.4] cherry pick
Posted by Daan Hoogland <da...@gmail.com>.
8e2e8e5e8ab492fa40dedc0788c0ac61f912487b
picked
On Fri, Apr 25, 2014 at 9:48 PM, Daan Hoogland <da...@gmail.com> wrote:
> On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi
> <Ra...@citrix.com> wrote:
>> f7f84fba89cf9eea856075d45bf623ff9ed7a632
>
>
> doesn't apply cleanly
>
> --
> Daan
--
Daan