Merge "[odl] Get latest changes" into stable/colorado
authorMichal Skalski <mskalski@mirantis.com>
Wed, 12 Oct 2016 08:17:50 +0000 (08:17 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 12 Oct 2016 08:17:50 +0000 (08:17 +0000)

Trivial merge