From: Tim Rozet <trozet@redhat.com>
Date: Tue, 28 Jun 2016 18:58:11 +0000 (+0000)
Subject: Merge changes from topics 'fix_dpdk', 'vlan_support'
X-Git-Tag: colorado.1.0~157
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2840a7db67fdaf58567c195557c6fb8ee38f73bd;p=apex.git

Merge changes from topics 'fix_dpdk', 'vlan_support'

* changes:
  Fixes IP failure during os-collect-config ping check
  Adding VLAN support
---

2840a7db67fdaf58567c195557c6fb8ee38f73bd