Merge "Do not configure state matching when using GRE"
authorJenkins <jenkins@review.openstack.org>
Fri, 25 Nov 2016 14:45:13 +0000 (14:45 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 25 Nov 2016 14:45:13 +0000 (14:45 +0000)

Trivial merge