From cd5277dec8abd5eabe50e1820e0f1cfa48a3d426 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Wed, 14 Feb 2018 22:06:55 +0100 Subject: [PATCH] Manual merging fixups for ALLO-MNT --- data/dns/allo.dn42 | 3 ++- data/dns/chan.dn42 | 1 + data/dns/img.dn42 | 3 ++- data/dns/laxu.dn42 | 1 + data/dns/munin.dn42 | 1 + data/dns/seafile.dn42 | 1 + data/dns/stats.dn42 | 1 + data/inetnum/172.22.152.0_25 | 3 +-- data/inetnum/172.22.168.128_25 | 3 +-- data/mntner/ALLO-MNT | 11 ++++++----- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/data/dns/allo.dn42 b/data/dns/allo.dn42 index 862f8352f..777426216 100644 --- a/data/dns/allo.dn42 +++ b/data/dns/allo.dn42 @@ -4,4 +4,5 @@ nserver: ns.allo.dn42 fd10:1074:41f6::1 status: EVALPEND 1503915501 admin-c: ALLO-DN42 tech-c: ALLO-DN42 -mnt-by: ALLO-MNT +mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/chan.dn42 b/data/dns/chan.dn42 index 3387cba2f..df95344aa 100644 --- a/data/dns/chan.dn42 +++ b/data/dns/chan.dn42 @@ -4,3 +4,4 @@ status: EVALPEND 1503829504 admin-c: ALLO-DN42 tech-c: ALLO-DN42 mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/img.dn42 b/data/dns/img.dn42 index 1ff4d0700..3457bd02b 100644 --- a/data/dns/img.dn42 +++ b/data/dns/img.dn42 @@ -3,4 +3,5 @@ nserver: ns.allo.dn42 status: EVALPEND 1503916868 admin-c: ALLO-DN42 tech-c: ALLO-DN42 -mnt-by: ALLO-MNT +mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/laxu.dn42 b/data/dns/laxu.dn42 index 5da6ff58d..830998b58 100644 --- a/data/dns/laxu.dn42 +++ b/data/dns/laxu.dn42 @@ -4,3 +4,4 @@ status: EVALPEND 1503917125 admin-c: ALLO-DN42 tech-c: ALLO-DN42 mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/munin.dn42 b/data/dns/munin.dn42 index 9fc340ff0..ab24aad0d 100644 --- a/data/dns/munin.dn42 +++ b/data/dns/munin.dn42 @@ -5,3 +5,4 @@ status: EVALPEND 1503917490 admin-c: ALLO-DN42 tech-c: ALLO-DN42 mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/seafile.dn42 b/data/dns/seafile.dn42 index 800c24e2f..88de7903b 100644 --- a/data/dns/seafile.dn42 +++ b/data/dns/seafile.dn42 @@ -5,3 +5,4 @@ status: EVALPEND 1503918367 admin-c: ALLO-DN42 tech-c: ALLO-DN42 mnt-by: ALLO-MNT +source: DN42 diff --git a/data/dns/stats.dn42 b/data/dns/stats.dn42 index da49d8231..96a332be5 100644 --- a/data/dns/stats.dn42 +++ b/data/dns/stats.dn42 @@ -5,3 +5,4 @@ status: EVALPEND 1503918668 admin-c: ALLO-DN42 tech-c: ALLO-DN42 mnt-by: ALLO-MNT +source: DN42 diff --git a/data/inetnum/172.22.152.0_25 b/data/inetnum/172.22.152.0_25 index c50ba4d90..28a7eb264 100644 --- a/data/inetnum/172.22.152.0_25 +++ b/data/inetnum/172.22.152.0_25 @@ -4,7 +4,6 @@ netname: ALLO's dn42 network admin-c: ALLO-DN42 tech-c: ALLO-DN42 status: ASSIGNED -mnt-by: ALLO-MNT +mnt-by: ALLO-MNT cidr: 172.22.152.0/25 -mnt-by: DUMMY-MNT source: DN42 diff --git a/data/inetnum/172.22.168.128_25 b/data/inetnum/172.22.168.128_25 index 79c699513..349f7e89c 100644 --- a/data/inetnum/172.22.168.128_25 +++ b/data/inetnum/172.22.168.128_25 @@ -4,7 +4,6 @@ netname: ALLO's dn42 network admin-c: ALLO-DN42 tech-c: ALLO-DN42 status: ASSIGNED -mnt-by: ALLO-MNT +mnt-by: ALLO-MNT cidr: 172.22.168.128/25 -mnt-by: DUMMY-MNT source: DN42 diff --git a/data/mntner/ALLO-MNT b/data/mntner/ALLO-MNT index a2e2a0dbc..9b956716e 100644 --- a/data/mntner/ALLO-MNT +++ b/data/mntner/ALLO-MNT @@ -1,5 +1,6 @@ -mntner: ALLO-MNT -descr: allo network maintainer -admin-c: ALLO-DN42 -tech-c: ALLO-DN42 -mnt-by: ALLO-MNT +mntner: ALLO-MNT +descr: allo network maintainer +admin-c: ALLO-DN42 +tech-c: ALLO-DN42 +mnt-by: ALLO-MNT +source: DN42