summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Smits <Ivo@UCIS.nl>2011-02-15 02:30:11 +0100
committerIvo Smits <Ivo@UCIS.nl>2011-02-15 02:30:11 +0100
commitd364a9c8dfe2c00e64388cb51b1bd097924aace9 (patch)
treee1c0c7af72b46a7a5461c14ef9da46006736b169
parent61adf8213a5bef4d46240e3ed88758f698ae9461 (diff)
parent390acfe7c72dbe6be768ed4c513b2fa6a47d5235 (diff)
downloadresdb-d364a9c8dfe2c00e64388cb51b1bd097924aace9.tar.gz
resdb-d364a9c8dfe2c00e64388cb51b1bd097924aace9.zip
Merge branch 'master' of git://git1.somerandomnick.ano
-rw-r--r--db/as/170/owner1
-rw-r--r--db/ip/01/00/AA/cidr1
-rw-r--r--db/ip/01/00/AA/owner1
-rw-r--r--db/usr/harald/git2
4 files changed, 4 insertions, 1 deletions
diff --git a/db/as/170/owner b/db/as/170/owner
new file mode 100644
index 0000000..d96e291
--- /dev/null
+++ b/db/as/170/owner
@@ -0,0 +1 @@
+harald
diff --git a/db/ip/01/00/AA/cidr b/db/ip/01/00/AA/cidr
new file mode 100644
index 0000000..d7d027f
--- /dev/null
+++ b/db/ip/01/00/AA/cidr
@@ -0,0 +1 @@
+1.0.170.0/24
diff --git a/db/ip/01/00/AA/owner b/db/ip/01/00/AA/owner
new file mode 100644
index 0000000..d96e291
--- /dev/null
+++ b/db/ip/01/00/AA/owner
@@ -0,0 +1 @@
+harald
diff --git a/db/usr/harald/git b/db/usr/harald/git
index 45d11d3..7f1e0a9 100644
--- a/db/usr/harald/git
+++ b/db/usr/harald/git
@@ -1 +1 @@
-git://1.0.169.1/ano2.git
+git://1.0.169.14/ano.git