From f87d3a3d945ba4f3993bdc2ff330cd9fb83df71c Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sat, 21 Mar 2020 20:39:52 +0000 Subject: [PATCH] Manual merge of pr#1294 to squash original 31 commits. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original signature --- commit d577f686ac4cc580ee99f6176f45f94a9f039f1d gpg: Signature made Thu 19 Mar 2020 13:33:00 GMT gpg: using RSA key 68A74AE5626DE107 gpg: Good signature from "zheng (lz) " [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 0D48 472E 6FD4 69D0 DEE0 91FC 68A7 4AE5 626D E107 Author: lz Date: Thu Mar 19 12:38:39 2020 +0000 --- --- Squashed commit of the following: commit 8f438cc0e64351d40290e48427def732b76b48cf Merge: a7fee95b 24fdb6fc Author: Simon Marsh Date: Sat Mar 21 20:37:10 2020 +0000 Merge branch 'master' of git.dn42.us:lz/registry into lz-original commit 24fdb6fc44968d433cb40660aff8b58441ddebfc Merge: d577f686 37d485b5 Author: lz Date: Thu Mar 19 21:34:13 2020 +0800 Merge branch 'master' of git.dn42.us:lz/registry commit d577f686ac4cc580ee99f6176f45f94a9f039f1d Author: lz Date: Thu Mar 19 12:38:39 2020 +0000 删除 'data/1' commit 37d485b5e093c17114f4eadc54fc578457f727cb Author: lz Date: Thu Mar 19 12:38:39 2020 +0000 删除 'data/1' commit c90b7c7a5db4d5bd4de5236000c98b006d743dbf Merge: 9216d7ca 6c531f82 Author: lz Date: Wed Mar 18 09:08:09 2020 +0800 Merge branch 'master' of git.dn42.us:lz/registry commit 9216d7ca51f42972e726e9f193defd0b71a33104 Author: lz Date: Tue Mar 17 23:06:34 2020 +0000 更新 'data/inetnum/172.23.145.0_24' commit 6c531f8250ba18fcd5824d4ec9b746a26f298470 Author: lz Date: Tue Mar 17 23:06:34 2020 +0000 更新 'data/inetnum/172.23.145.0_24' commit c7fd392cae2f33e73c7310c88806801f820b26b4 Author: lz Date: Tue Mar 17 00:53:32 2020 +0000 添加 'data/route/172.23.145.0_24' commit a41e53fcd340f46478d9f8ab1c66d315b3dd3e4f Author: lz Date: Tue Mar 17 00:47:17 2020 +0000 更新 'data/inetnum/172.23.145.0_24' commit b296da688375056ef83f0553cb5d91a738900198 Author: lz Date: Tue Mar 17 00:32:57 2020 +0000 删除 'data/route/172.20.56.0_25' commit 377b3c4b2cf0dc93234517349a262b0135126ed8 Author: lz Date: Tue Mar 17 00:08:33 2020 +0000 添加 'data/route/172.20.56.0_25' commit 8845a7274ff35740877829095c67ee9d4ae59b00 Author: lz Date: Mon Mar 16 23:22:06 2020 +0000 更新 'data/inetnum/172.20.56.0_25' commit 54e6c235f9e4451997e7d1b893844301c41fb5e3 Author: lz Date: Mon Mar 16 23:17:44 2020 +0000 更新 'data/inetnum/172.20.56.0_25' commit 501116e75c4e5805d4073c47850775e71006f8cb Author: lz Date: Mon Mar 16 23:17:25 2020 +0000 添加 'data/inetnum/172.20.56.0_25' commit ce67135563101d48dca9555bfa8a5c1ed3d2569a Author: lz Date: Mon Mar 16 22:54:15 2020 +0000 更新 'data/person/MICROLZ-DN42' commit 3efd3cf254e828c272d458c4605ca98f37ee67ac Author: lz Date: Mon Mar 16 22:52:40 2020 +0000 更新 'data/person/microlz-DN42' commit 0cbdd430a588d7eb4bbf0e1e45c9b20650f3f0f1 Author: lz Date: Mon Mar 16 22:52:29 2020 +0000 更新 'data/person/microlz-DN42' commit 2a8dfcf0de129c11f0975b1e929ac831d635b648 Author: lz Date: Mon Mar 16 22:49:25 2020 +0000 更新 'data/mntner/LZ-MNT' commit 2e9f80755011888fbeb5fc8015d7cd7a1fb2ca93 Author: lz Date: Mon Mar 16 22:48:49 2020 +0000 删除 'data/inetnum/172.23.166.0_23' commit 0c087a5656607d547f3f0c1a8f2615c78fb9d74f Author: lz Date: Mon Mar 16 22:48:22 2020 +0000 更新 'data/aut-num/AS4242423654' commit 8c31f858cdcf6678dd06ae815e8dcceb31198e0d Author: lz Date: Mon Mar 16 22:43:54 2020 +0000 更新 'data/aut-num/AS4242423654' commit 73d609e5c3e4af5465c2dca6d19a89987aadaf61 Author: lz Date: Mon Mar 16 22:43:10 2020 +0000 更新 'data/inetnum/172.23.166.0_23' commit f29162878d18d2b126f36a1bce868a9abf391a7d Author: lz Date: Mon Mar 16 22:42:25 2020 +0000 更新 'data/mntner/LZ-MNT' commit d9ddcc07718492f46c62d7cbda99785c8306e5cc Author: lz Date: Mon Mar 16 22:36:44 2020 +0000 更新 'data/person/microlz-DN42' commit c1f3811dcc8574848882eeea4043c708ac61f6aa Author: lz Date: Mon Mar 16 22:36:05 2020 +0000 更新 'data/inetnum/172.23.166.0_23' commit e0daa66f7b2fcfe18a22c421cfc952f4c5e67f05 Author: lz Date: Mon Mar 16 22:33:43 2020 +0000 更新 'data/aut-num/AS4242423654' commit bffede3c3b801339e9065dfb3426db0a8c09de2a Author: lz Date: Mon Mar 16 22:27:09 2020 +0000 删除 'data/aut-num/AS4242429960' commit bd2e38cabb62e29107d9b064bea546a5ab780443 Author: lz Date: Mon Mar 16 22:26:02 2020 +0000 添加 'data/aut-num/AS4242423654' commit e57b52b84c57250e42e5b648518c2719733740a8 Author: lz Date: Mon Mar 16 14:06:36 2020 +0000 添加 'data/inetnum/172.23.166.0_23' commit 0a24f29b52a058d01d0513e0322d050cb03eb973 Author: lz Date: Mon Mar 16 14:03:45 2020 +0000 添加 'data/aut-num/AS4242429960' commit a5b8a483108bc502187d0aaf4b4f901312520b5f Author: lz Date: Mon Mar 16 14:00:36 2020 +0000 添加 'data/person/microlz-DN42' commit f073bca1e21f0e08c3fce7ce6a71d254e4f1d77a Author: lz Date: Mon Mar 16 13:51:48 2020 +0000 添加 'data/mntner/lz-MNT' --- data/aut-num/AS4242423654 | 6 ++++++ data/inetnum/172.23.145.0_24 | 11 +++++++++++ data/mntner/LZ-MNT | 7 +++++++ data/person/MICROLZ-DN42 | 5 +++++ data/route/172.23.145.0_24 | 5 +++++ 5 files changed, 34 insertions(+) create mode 100644 data/aut-num/AS4242423654 create mode 100644 data/inetnum/172.23.145.0_24 create mode 100644 data/mntner/LZ-MNT create mode 100644 data/person/MICROLZ-DN42 create mode 100644 data/route/172.23.145.0_24 diff --git a/data/aut-num/AS4242423654 b/data/aut-num/AS4242423654 new file mode 100644 index 000000000..550db984c --- /dev/null +++ b/data/aut-num/AS4242423654 @@ -0,0 +1,6 @@ +aut-num: AS4242423654 +as-name: MICROLZ-AS +admin-c: MICROLZ-DN42 +tech-c: MICROLZ-DN42 +mnt-by: LZ-MNT +source: DN42 diff --git a/data/inetnum/172.23.145.0_24 b/data/inetnum/172.23.145.0_24 new file mode 100644 index 000000000..e9247df76 --- /dev/null +++ b/data/inetnum/172.23.145.0_24 @@ -0,0 +1,11 @@ +inetnum: 172.23.145.0 - 172.23.145.255 +netname: LZ-IPV4 +remarks: Peer with me at zhengbenyu@foxmial.com +descr: Peer with me at zhengbenyu@foxmail.com +country: CN +admin-c: MICROLZ-DN42 +tech-c: MICROLZ-DN42 +mnt-by: LZ-MNT +status: ASSIGNED +cidr: 172.23.145.0/24 +source: DN42 diff --git a/data/mntner/LZ-MNT b/data/mntner/LZ-MNT new file mode 100644 index 000000000..30e4e0530 --- /dev/null +++ b/data/mntner/LZ-MNT @@ -0,0 +1,7 @@ +mntner: LZ-MNT +descr: LZ Networks +admin-c: MICROLZ-DN42 +tech-c: MICROLZ-DN42 +mnt-by: LZ-MNT +auth: pgp-fingerprint 0D48472E6FD469D0DEE091FC68A74AE5626DE107 +source: DN42 diff --git a/data/person/MICROLZ-DN42 b/data/person/MICROLZ-DN42 new file mode 100644 index 000000000..1f5a1d7c6 --- /dev/null +++ b/data/person/MICROLZ-DN42 @@ -0,0 +1,5 @@ +person: Microlz +contact: zhengbenyu@foxmail.com +nic-hdl: MICROLZ-DN42 +mnt-by: LZ-MNT +source: DN42 diff --git a/data/route/172.23.145.0_24 b/data/route/172.23.145.0_24 new file mode 100644 index 000000000..d6742575d --- /dev/null +++ b/data/route/172.23.145.0_24 @@ -0,0 +1,5 @@ +route: 172.23.145.0/24 +descr: Peer with me at zhengbenyu@foxmail.com +origin: AS4242423654 +mnt-by: LZ-MNT +source: DN42