Merge changes Idf3f69db,I4499d7c7,I512af911
authorAlessandro Boch <aboch@cisco.com>
Fri, 3 Jan 2014 17:52:35 +0000 (17:52 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 3 Jan 2014 17:52:35 +0000 (17:52 +0000)
* changes:
  Initial fix to topology-adapter.
  Fixed topology-manager now that we have topology-lldp-discovery
  Added topology-lldp-discovery module


No differences found