diff options
author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /retiolum/hosts/xso | |
parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'retiolum/hosts/xso')
-rw-r--r-- | retiolum/hosts/xso | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/retiolum/hosts/xso b/retiolum/hosts/xso deleted file mode 100644 index 1f035a78..00000000 --- a/retiolum/hosts/xso +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:fb16:96ad:c849:f5d4:2170:103d:e86b/128 -Subnet = 42.124.174.80/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1p1WG0yDOku0u8XPzN2BAcrkVeR11c8Si3sz2BNoYPitdA2wW/TE -mHjGw4Dxt1Q+lWmxtsNnV2x5IoZBSIovS8Tuj4O6mVTmgSJSta988gzmeImQksb6 -+/d4LQmqc6/u24sKrWEPQ7sCpb5sPGr1K1yLNtAnD7pt3rGiX/VK/SKBYKpB5wGf -snRHB5fj/4yc5M7YjQI+TO0jTKdlf9B4JrRX/DhbmZ9n/EPGREGUgrDyi66Jk8ea -yRyCg/5UcHD6z74ZN6Is4bbQXZaQ4S61r+JmFebsC2CxkZ20jayDBRKcQL6yH0ZZ -a1rAdUqyh894vNctn52GAp7P96dhwAnwEQIDAQAB ------END RSA PUBLIC KEY----- |