Merge branch 'master' into og-remoteport-fix

lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm

@@ -288,7 +288,9 @@ sub store_neighbors {
       # update master of our aggregate to be a neighbor of
       # the master on our peer device (a lot of iffs to get there...).
       # & cannot use ->neighbor prefetch because this is the port insert!
-      if ($peer_device and $peer_device->in_storage and defined $portrow->slave_of) {
+      if (defined $portrow->slave_of) {
+
+          my $peer_device = get_device($remote_ip);
           my $master = schema('netdisco')->resultset('DevicePort')->single({
             ip => $device->ip,
             port => $portrow->slave_of
@@ -309,6 +311,7 @@ sub store_neighbors {
   return @to_discover;
 }
 
+<<<<<<< HEAD
 sub long_port {
   my $port = shift or return '';
   $port =~ s/^([a-z]{2})(\d.+)$/$1%$2/i;
@@ -323,6 +326,8 @@ sub short_port {
   return (($start && $end) ? "${start}${end}" : $port);
 }
 
+=======
+>>>>>>> master
 # 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.
 sub set_manual_topology {