summaryrefslogtreecommitdiffstats
path: root/retiolum/hosts/laqueus
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2013-01-14 14:46:22 +0100
committermakefu <github@syntax-fehler.de>2013-01-14 14:46:22 +0100
commitdbe2d838ba6834788265029162b2dd7d82473335 (patch)
treea4eb38f7fc91d91269b6f83453de62242c6ddc23 /retiolum/hosts/laqueus
parent5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff)
parentabf9916bc1add17888308877fa4eb9da330297ef (diff)
Merge branch 'master' of github.com:krebscode/painload
Conflicts: god/temper/Makefile god/temper/collectd-temper.sh
Diffstat (limited to 'retiolum/hosts/laqueus')
-rw-r--r--retiolum/hosts/laqueus4
1 files changed, 2 insertions, 2 deletions
diff --git a/retiolum/hosts/laqueus b/retiolum/hosts/laqueus
index cf4ecad5..0bdef307 100644
--- a/retiolum/hosts/laqueus
+++ b/retiolum/hosts/laqueus
@@ -1,5 +1,5 @@
-Subnet = 42:0:0:0:0:0:0:1a1a/128
-Subnet = 10.243.0.12/32
+Subnet = 42:0:0:0:0:0:0:1a1a/128
+Subnet = 10.243.0.12/32
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAy9lnH4qDSYeNbpzpcQyq2LzzxkVy2N1vGgKkVttzx0cgMvyRm3aX