Merge "Changes in DiscoveryService to cope with recently introduced HA active-active...
authorAlessandro Boch <aboch@cisco.com>
Wed, 17 Jul 2013 21:04:51 +0000 (21:04 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 17 Jul 2013 21:04:51 +0000 (21:04 +0000)

Trivial merge