update version to 3.1.5-rc1

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1169 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h
index a2408671d7e35c0559e80eca115f0a7958f8c386..bd30e75e90442cad0f62dc958fd25fe313b9e87b 100644 (file)
--- a/pdns/config-recursor.h
+++ b/pdns/config-recursor.h
@@ -1,6 +1,6 @@
 #define SYSCONFDIR "/etc/powerdns/" 
 #define LOCALSTATEDIR "/var/run/" 
-#define VERSION "3.1.5-snapshot5"
+#define VERSION "3.1.5-rc1"
 #define RECURSOR
 #ifndef WIN32
 

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index b089c93d13de176b3ce49648a2ba5cf87f692a67..16de18814fb33a4225ba51d5cec97198f7065af1 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -1,4 +1,4 @@
-VERSION=3.1.5-snapshot5
+VERSION=3.1.5-rc1
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \
 rcpgenerator.hh lock.hh dnswriter.hh  dnsrecords.hh dnsparser.hh utility.hh \

diff --git a/pdns/docs/pdns_recursor.1.txt b/pdns/docs/pdns_recursor.1.txt
index 66ffed48242c3112811e80fec5aa972a27b1ec8b..a9b42d7722e6b0e9e56eb0d994e0c3ad403f270d 100644 (file)
--- a/pdns/docs/pdns_recursor.1.txt
+++ b/pdns/docs/pdns_recursor.1.txt
@@ -1,7 +1,7 @@
 PDNS_RECURSOR(1)\r
 ================
 bert hubert <bert.hubert@netherlabs.nl>
-v3.0, 19 April 2006
+v3.0, 22 March 2008
 
 NAME
 ----
@@ -76,6 +76,9 @@ For authoritative listing of options, consult the documentation referenced above
 
 --delegation-only::
        Which domains we only accept delegations from
+\r
+--entropy-source::\r
+       Where to read new entropy from, defaults to /dev/urandom.\r
 
 --export-etc-hosts::
            If set, this flag will export the host names and IP addresses
@@ -86,13 +89,13 @@ For authoritative listing of options, consult the documentation referenced above
 --forward-zones::
            Comma separated list of 'zonename=IP' pairs. Queries for zones
            listed here will be forwarded to the IP address listed.
-           auth-zones= ds9a.nl=213.244.168.210, powerdns.com=127.0.0.1.
-           Available since 3.1.
+           forward-zones= ds9a.nl=213.244.168.210, powerdns.com=127.0.0.1.
+           Available since 3.1. For more details, see the manual.
 
 --forward-zones-file::
            listed here will be forwarded to the IP address listed.
            One zone per line, like: ds9a.nl=213.244.168.210
-           Available since 3.1.5
+           Available since 3.1.5. For more details, see the manual.
 
 --hint-file::
        If set, load root hints from this file

diff --git a/pdns/packer-recursor/changelog b/pdns/packer-recursor/changelog
index 8514a2ee1dcb57eef479cdb653051fe7a7889252..4f24be324f744a0aadf2bb112185a7b5d13bde4f 100644 (file)
--- a/pdns/packer-recursor/changelog
+++ b/pdns/packer-recursor/changelog
@@ -1,3 +1,7 @@
+3.1.5-rc1-1
+Sat, 22 Mar 2008 19:42:46 +0100
+* Heading up to release
+-- bert hubert <bert.hubert@netherlabs.nl>
 3.1.5-snapshot5-1
 Sat, 15 Mar 2008 23:36:13 +0100
 * first .deb of snapshots

diff --git a/pdns/packer-recursor/version b/pdns/packer-recursor/version
index 653375d214d8f469edc8a77ae6d94f7cd71b745f..e821b31fd8bcaca74a7281870666e1bca50d86e6 100644 (file)
--- a/pdns/packer-recursor/version
+++ b/pdns/packer-recursor/version
@@ -1 +1 @@
-3.1.5-snapshot5
+3.1.5-rc1

diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec
index bbbae68a8414b33749420775571a9cb000aafbed..bb42f12c0d540dc57948fe1ceedbbb1c8e8d45bb 100644 (file)
--- a/pdns/pdns-recursor.spec
+++ b/pdns/pdns-recursor.spec
@@ -2,7 +2,7 @@
 
 Buildroot: /tmp/pdns/
 Name: pdns-recursor
-Version: 3.1.5snapshot5
+Version: 3.1.5rc1
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver
 License: GPL