Merge "BUG-4032: Missing topology-lldp-discovery config"
authorAbhijit Kumbhare <abhijit.kumbhare@ericsson.com>
Wed, 29 Jul 2015 13:25:02 +0000 (13:25 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 29 Jul 2015 13:25:02 +0000 (13:25 +0000)

Trivial merge