You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Min Chen <mi...@citrix.com> on 2014/05/20 01:30:08 UTC
[ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Hi Daan,
As we proposed earlier in community, since IAM feature is not ready for 4.4 release due to backwards compatibility issue, we need to disable IAM on 4.4. I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on 4.4-forward to disable IAM, would you please cherry-pick this commit from 4.4-forward to 4.4 branch? To avoid causing some regressions due to this disabling, we have run BVT on this commit and got results (http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Report/370/) compared to 4.3 BVT baseline.
Thanks
-min
Re: [ACS4.4] Cherry-pick e3bb8b98bd9055115004da2ec67b29271a3974c5
Posted by Daan Hoogland <da...@gmail.com>.
On Thu, May 22, 2014 at 1:29 AM, Kelven Yang <ke...@citrix.com> wrote:
> e3bb8b98bd9055115004da2ec67b29271a3974c5
pulled, please note that there is trailing spaces in xml files and
log4j.properties. Reviewing I also encountered an old conflict in
comment. I'll look for that one in head and resolve it there.
--
Daan
[ACS4.4] Cherry-pick e3bb8b98bd9055115004da2ec67b29271a3974c5
Posted by Kelven Yang <ke...@citrix.com>.
There is an typo on the bug id, it should be the fix for CLOUDSTACK-6743
commit e3bb8b98bd9055115004da2ec67b29271a3974c5
Author: Kelven Yang <ke...@gmail.com>
Date: Wed May 21 16:14:14 2014 -0700
CLOUDSTACK-5485: Use edge-triggering in MessageDetector to handle
bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a
tight loop to spin
Thanks
Kelven
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Daan Hoogland <da...@gmail.com>.
On Tue, May 20, 2014 at 11:29 PM, Min Chen <mi...@citrix.com> wrote:
> git rm test/integration/smoke/test_vm_iam.py
works. pulled.
--
Daan
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Min Chen <mi...@citrix.com>.
Hi Daan,
The cherry pick error is due to a deleted iam test since we disabled IAM
feature:
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by them: test/integration/smoke/test_vm_iam.py
So the fix is to run "git rm test/integration/smoke/test_vm_iam.py". I
can do that if you allow me to check into 4.4.
Thanks.
-min
On 5/20/14 2:12 PM, "Min Chen" <mi...@citrix.com> wrote:
>Ok. Let me try. Can I cherry pick this into 4.4 after resolving the
>conflict?
>
>Thanks
>-min
>
>On 5/20/14 1:44 PM, "Daan Hoogland" <da...@gmail.com> wrote:
>
>>Sorry Min,
>>
>>I didn't check the conflict, just aborted.
>>
>>On Tue, May 20, 2014 at 6:20 PM, Min Chen <mi...@citrix.com> wrote:
>>> Hi Daan,
>>>
>>> What is the conflict? Do you need me to resolve the conflict?
>>>Sorry, just
>>> realized that the URL is internal to citrix, not visible to outside.
>>>
>>> Thanks
>>> -min
>>>
>>>
>>> On 5/20/14 1:16 AM, "Daan Hoogland" <da...@gmail.com> wrote:
>>>
>>>>Min,
>>>>
>>>>On Tue, May 20, 2014 at 1:30 AM, Min Chen <mi...@citrix.com> wrote:
>>>>> Hi Daan,
>>>>>
>>>>> As we proposed earlier in community, since IAM feature is not ready
>>>>>for
>>>>>4.4
>>>>> release due to backwards compatibility issue, we need to disable IAM
>>>>>on
>>>>>4.4.
>>>>> I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on
>>>>> 4.4-forward to disable IAM, would you please cherry-pick this commit
>>>>>from
>>>>> 4.4-forward to 4.4 branch?
>>>>It does not cherry-pick cleanly.
>>>>
>>>> To avoid causing some regressions due to this
>>>>> disabling, we have run BVT on this commit and got results
>>>>>
>>>>>(http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Repo
>>>>>r
>>>>>t/
>>>>>370/)
>>>>is this a public url? I can not reach it.
>>>>
>>>>> compared to 4.3 BVT baseline.
>>>>>
>>>>> Thanks
>>>>> -min
>>>>
>>>>
>>>>
>>>>--
>>>>Daan
>>>
>>
>>
>>
>>--
>>Daan
>
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Min Chen <mi...@citrix.com>.
Ok. Let me try. Can I cherry pick this into 4.4 after resolving the
conflict?
Thanks
-min
On 5/20/14 1:44 PM, "Daan Hoogland" <da...@gmail.com> wrote:
>Sorry Min,
>
>I didn't check the conflict, just aborted.
>
>On Tue, May 20, 2014 at 6:20 PM, Min Chen <mi...@citrix.com> wrote:
>> Hi Daan,
>>
>> What is the conflict? Do you need me to resolve the conflict?
>>Sorry, just
>> realized that the URL is internal to citrix, not visible to outside.
>>
>> Thanks
>> -min
>>
>>
>> On 5/20/14 1:16 AM, "Daan Hoogland" <da...@gmail.com> wrote:
>>
>>>Min,
>>>
>>>On Tue, May 20, 2014 at 1:30 AM, Min Chen <mi...@citrix.com> wrote:
>>>> Hi Daan,
>>>>
>>>> As we proposed earlier in community, since IAM feature is not ready
>>>>for
>>>>4.4
>>>> release due to backwards compatibility issue, we need to disable IAM
>>>>on
>>>>4.4.
>>>> I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on
>>>> 4.4-forward to disable IAM, would you please cherry-pick this commit
>>>>from
>>>> 4.4-forward to 4.4 branch?
>>>It does not cherry-pick cleanly.
>>>
>>> To avoid causing some regressions due to this
>>>> disabling, we have run BVT on this commit and got results
>>>>
>>>>(http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Repor
>>>>t/
>>>>370/)
>>>is this a public url? I can not reach it.
>>>
>>>> compared to 4.3 BVT baseline.
>>>>
>>>> Thanks
>>>> -min
>>>
>>>
>>>
>>>--
>>>Daan
>>
>
>
>
>--
>Daan
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Daan Hoogland <da...@gmail.com>.
Sorry Min,
I didn't check the conflict, just aborted.
On Tue, May 20, 2014 at 6:20 PM, Min Chen <mi...@citrix.com> wrote:
> Hi Daan,
>
> What is the conflict? Do you need me to resolve the conflict? Sorry, just
> realized that the URL is internal to citrix, not visible to outside.
>
> Thanks
> -min
>
>
> On 5/20/14 1:16 AM, "Daan Hoogland" <da...@gmail.com> wrote:
>
>>Min,
>>
>>On Tue, May 20, 2014 at 1:30 AM, Min Chen <mi...@citrix.com> wrote:
>>> Hi Daan,
>>>
>>> As we proposed earlier in community, since IAM feature is not ready for
>>>4.4
>>> release due to backwards compatibility issue, we need to disable IAM on
>>>4.4.
>>> I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on
>>> 4.4-forward to disable IAM, would you please cherry-pick this commit
>>>from
>>> 4.4-forward to 4.4 branch?
>>It does not cherry-pick cleanly.
>>
>> To avoid causing some regressions due to this
>>> disabling, we have run BVT on this commit and got results
>>>
>>>(http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Report/
>>>370/)
>>is this a public url? I can not reach it.
>>
>>> compared to 4.3 BVT baseline.
>>>
>>> Thanks
>>> -min
>>
>>
>>
>>--
>>Daan
>
--
Daan
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Min Chen <mi...@citrix.com>.
Hi Daan,
What is the conflict? Do you need me to resolve the conflict? Sorry, just
realized that the URL is internal to citrix, not visible to outside.
Thanks
-min
On 5/20/14 1:16 AM, "Daan Hoogland" <da...@gmail.com> wrote:
>Min,
>
>On Tue, May 20, 2014 at 1:30 AM, Min Chen <mi...@citrix.com> wrote:
>> Hi Daan,
>>
>> As we proposed earlier in community, since IAM feature is not ready for
>>4.4
>> release due to backwards compatibility issue, we need to disable IAM on
>>4.4.
>> I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on
>> 4.4-forward to disable IAM, would you please cherry-pick this commit
>>from
>> 4.4-forward to 4.4 branch?
>It does not cherry-pick cleanly.
>
> To avoid causing some regressions due to this
>> disabling, we have run BVT on this commit and got results
>>
>>(http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Report/
>>370/)
>is this a public url? I can not reach it.
>
>> compared to 4.3 BVT baseline.
>>
>> Thanks
>> -min
>
>
>
>--
>Daan
Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043
Posted by Daan Hoogland <da...@gmail.com>.
Min,
On Tue, May 20, 2014 at 1:30 AM, Min Chen <mi...@citrix.com> wrote:
> Hi Daan,
>
> As we proposed earlier in community, since IAM feature is not ready for 4.4
> release due to backwards compatibility issue, we need to disable IAM on 4.4.
> I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on
> 4.4-forward to disable IAM, would you please cherry-pick this commit from
> 4.4-forward to 4.4 branch?
It does not cherry-pick cleanly.
To avoid causing some regressions due to this
> disabling, we have run BVT on this commit and got results
> (http://jenkins-ccp.citrix.com/view/SC_Automation/job/Adv_KVM_BVT_Report/370/)
is this a public url? I can not reach it.
> compared to 4.3 BVT baseline.
>
> Thanks
> -min
--
Daan