Merge "Commit includes: 1> NeutronVPN support for floating IPs associaton to fixed...
authorSam Hague <shague@redhat.com>
Mon, 20 Jun 2016 13:55:15 +0000 (13:55 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 20 Jun 2016 13:55:15 +0000 (13:55 +0000)

Trivial merge