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/minikrebs | |
| 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/minikrebs')
| -rw-r--r-- | retiolum/hosts/minikrebs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/retiolum/hosts/minikrebs b/retiolum/hosts/minikrebs index ad7278e2..b0d60558 100644 --- a/retiolum/hosts/minikrebs +++ b/retiolum/hosts/minikrebs @@ -1,5 +1,5 @@ Subnet = 10.243.1.1/32 -Subnet = 42:0:0:0:0:0:1:1/128 +#Subnet = 42:0:0:0:0:0:1:1/128 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA0fu8F+XJ6hHsIj8QtdSZIhE+Ae2sEIY4dHcnHbCOeHJlOQQDJrme frmG65BX4BMcClUyhvvMwlZIerFwsJoEwa39lB3/Y58OwSS9cNCZTShQPbyVy5wo |