Merge "ovs: update to OVS 2.5"
authorMaryam Tahhan <maryam.tahhan@intel.com>
Wed, 11 May 2016 14:32:00 +0000 (14:32 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 11 May 2016 14:32:00 +0000 (14:32 +0000)

Trivial merge