On Tue, May 20, 2014 at 11:29 PM, Min Chen wrote:
> git rm test/integration/smoke/test_vm_iam.py
works. pulled.
--
Daan
Hi Daan,
The cherry pick error is due to a deleted iam test since we disabled IAM
feature:
# Unmerged paths:
# (use "git add/rm ..." as appropriate to mark resolution)
#
# deleted by them:test/integration/smoke/test_vm_iam.py
So the fix is to run "git rm test/integr
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" wrote:
>Sorry Min,
>
>I didn't check the conflict, just aborted.
>
>On Tue, May 20, 2014 at 6:20 PM, Min Chen wrote:
>> Hi Daan,
>>
>> What is the conflict? Do
Sorry Min,
I didn't check the conflict, just aborted.
On Tue, May 20, 2014 at 6:20 PM, Min Chen 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
>
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" wrote:
>Min,
>
>On Tue, May 20, 2014 at 1:30 AM, Min Chen wrote:
>>
Min,
On Tue, May 20, 2014 at 1:30 AM, Min Chen 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
>
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 c
