From 8360af353bf1c2e5396aa98d41f8b348c76183e7 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 27 Mar 2020 13:19:35 +0800 Subject: [PATCH 1/4] modified: routes.txt --- routes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.txt b/routes.txt index e0a2f9b..28f2b5d 100644 --- a/routes.txt +++ b/routes.txt @@ -26,3 +26,4 @@ 10.127.2.0/24 NeoSystems VMs 10.127.3.0/24 pan hub (for non-multihome connection in Taiwan) 10.127.4.0/24 Icecat-Explosion (For Magicneko Explosion Network Interworking address) +172.24.5.0/24 Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA) From 53932762d779d60c8ac14bc8e8247573d0db9d16 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 27 Mar 2020 13:28:45 +0800 Subject: [PATCH 2/4] Fix errors when merging and synchronize with upstream --- routes.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/routes.txt b/routes.txt index 8b44915..7fdfc6c 100644 --- a/routes.txt +++ b/routes.txt @@ -33,13 +33,9 @@ Network ID Protocol Upstream Downstream Comment Subnet Name Comment 10.127.1.0/24 CROOM 10.127.2.0/24 NeoSystems VMs -<<<<<<< HEAD 10.127.3.0/24 pan hub (for non-multihome connection in Taiwan) 10.127.4.0/24 Icecat-Explosion (For Magicneko Explosion Network Interworking address) 172.24.5.0/24 Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA) -======= -10.127.3.0/24 pan hub for non-multihome connection in Taiwan -10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address +======================+ @@ -52,4 +48,4 @@ Loopback Address Name System Comment 10.127.255.2 ucbvax Arch Linux/frr 10.127.255.4 pan Arch Linux/frr 10.127.255.80 NeoSystem Arch Linux/frr ->>>>>>> upstream/master + From 653ef61fad516ca543b4c60ea084e73429e3a688 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 27 Mar 2020 13:30:44 +0800 Subject: [PATCH 3/4] modified: routes.txt Continue to fix synchronization issues with the upstream and push to the local library --- routes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes.txt b/routes.txt index 7fdfc6c..a32a4ed 100644 --- a/routes.txt +++ b/routes.txt @@ -33,9 +33,9 @@ Network ID Protocol Upstream Downstream Comment Subnet Name Comment 10.127.1.0/24 CROOM 10.127.2.0/24 NeoSystems VMs -10.127.3.0/24 pan hub (for non-multihome connection in Taiwan) -10.127.4.0/24 Icecat-Explosion (For Magicneko Explosion Network Interworking address) -172.24.5.0/24 Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA) +10.127.3.0/24 pan hub for non-multihome connection in Taiwan +10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address +172.24.5.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA +======================+ From 195023a30dff870a7ca8ef752eb63a60c5b79802 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 27 Mar 2020 13:32:33 +0800 Subject: [PATCH 4/4] modified: routes.txt Synchronize capitalization of English sentences and maintain the integrity of OCD --- routes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes.txt b/routes.txt index a32a4ed..f2e9ba0 100644 --- a/routes.txt +++ b/routes.txt @@ -34,8 +34,8 @@ Subnet Name Comment 10.127.1.0/24 CROOM 10.127.2.0/24 NeoSystems VMs 10.127.3.0/24 pan hub for non-multihome connection in Taiwan -10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address -172.24.5.0/24 Icecat-Mobile-devices For Mobile device internal network segment for testing connectivity quality, No SLA +10.127.4.0/24 Icecat-Explosion for Magicneko Explosion Network Interworking address +172.24.5.0/24 Icecat-Mobile-devices for Mobile device internal network segment for testing connectivity quality, No SLA +======================+