DaanHoogland commented on PR #10082: URL: https://github.com/apache/cloudstack/pull/10082#issuecomment-2539053873
> > @weizhouapache , any reason this should be on 4.20 and not 4.19? > > as the line of code is different in 4.19/4.20 > > ``` > @@ -377,7 +452,7 @@ > <a-form-item > name="conservemode" > ref="conservemode" > - v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService"> > + v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService && !forNsx && networkmode !== 'ROUTED'"> > <template #label> > <tooltip-label :title="$t('label.conservemode')" :tooltip="apiParams.conservemode.description"/> > </template> > ``` > > I can rebase to 4.19 if you think it is needed. (then you will face merge conflict when merge forward 😄 ) thanks, I think I wil live with it ;) but it should not be a big deal. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org