never mind my two mails ago
On Wed, May 28, 2014 at 8:00 AM, <i...@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
