3 Commits

Author SHA1 Message Date
Sheng Yang
b96fea2e06 Automation: BVT: Fix test_guest_vlan_range.py due to updated API 2013-08-02 16:47:32 -07:00
Prasanna Santhanam
80c2ea769e Fixing merge markers introduced by conflict from 2660a6
test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 14:35:45 +05:30
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30