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)
commitcd70a1080d382015a1eebbde8fa0d9ad156ce404
treec172df64d3938edff89e224ca915110258f8ae31
parent1993a259ac7f42767064d9a5c5e2dcef91e8333d
parent975bbe8a0ed13973cecd2040e523570653fd7d98
Merge changes Idf3f69db,I4499d7c7,I512af911

* changes:
  Initial fix to topology-adapter.
  Fixed topology-manager now that we have topology-lldp-discovery
  Added topology-lldp-discovery module