135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/og-remoteport-fix' into og-remoteport-fix

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-10 21:38:25 +01:00
parent f2ee3fde72 b64548c0d7
commit 5d96a1d1c0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -311,7 +311,6 @@ sub store_neighbors {
return @to_discover; return @to_discover;
} }
<<<<<<< HEAD
sub long_port { sub long_port {
my $port = shift or return ''; my $port = shift or return '';
$port =~ s/^([a-z]{2})(\d.+)$/$1%$2/i; $port =~ s/^([a-z]{2})(\d.+)$/$1%$2/i;
@@ -326,8 +325,6 @@ sub short_port {
return (($start && $end) ? "${start}${end}" : $port); return (($start && $end) ? "${start}${end}" : $port);
} }
=======
>>>>>>> master
# take data from the topology table and update remote_ip and remote_port # take data from the topology table and update remote_ip and remote_port
# in the devices table. only use root_ips and skip any bad topo entries. # in the devices table. only use root_ips and skip any bad topo entries.
sub set_manual_topology { sub set_manual_topology {