From: Robert Varga <nite@hq.sk>
Date: Sun, 10 Nov 2019 11:16:21 +0000 (+0000)
Subject: Merge changes from topic "odlparent-6.0.1"
X-Git-Tag: release/magnesium~36
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3319977726354f34d63c1c15f07196f30080b880;p=openflowplugin.git

Merge changes from topic "odlparent-6.0.1"

* changes:
  Bump to odlparent-6.0.1/yangtools-4.0.2/mdsal-5.0.4
  Fix meter-id overlap
---

3319977726354f34d63c1c15f07196f30080b880