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" <min.c...@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" <daan.hoogl...@gmail.com> wrote:
>
>>Sorry Min,
>>
>>I didn't check the conflict, just aborted.
>>
>>On Tue, May 20, 2014 at 6:20 PM, Min Chen <min.c...@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" <daan.hoogl...@gmail.com> wrote:
>>>
>>>>Min,
>>>>
>>>>On Tue, May 20, 2014 at 1:30 AM, Min Chen <min.c...@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
>
