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/05/28 10:14:00 UTC

Re: [1/2] git commit: updated refs/heads/4.3.0-forward to 825929d

never mind my two mails ago



On Wed, May 28, 2014 at 8:00 AM,  <il...@apache.org> wrote:
...

> -<<<<<<< HEAD
>              try {
> -=======
> -        if (switchName == null
> -                && (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage)) {
> -            switchName = _privateNetworkVSwitchName;
> -        }
> ->>>>>>> 5bc72ea... CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic


-- 
Daan