Merge changes from topics 'fix_dpdk', 'vlan_support'
authorTim Rozet <trozet@redhat.com>
Tue, 28 Jun 2016 18:58:11 +0000 (18:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 28 Jun 2016 18:58:11 +0000 (18:58 +0000)
* changes:
  Fixes IP failure during os-collect-config ping check
  Adding VLAN support

1  2 
ci/deploy.sh

diff --cc ci/deploy.sh
Simple merge