Merge "Disabling the ODL plugin waiting for Fuel 7 uplift"
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Thu, 19 Nov 2015 12:32:08 +0000 (12:32 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 19 Nov 2015 12:32:08 +0000 (12:32 +0000)

Trivial merge