summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mauchle <fabian.mauchle@switch.ch>2017-02-28 08:52:28 +0100
committerFabian Mauchle <fabian.mauchle@switch.ch>2017-02-28 08:52:28 +0100
commit48e1b2cb543eb2ff48b26ecaed3146d3b0b3e2f3 (patch)
tree12759587ef3ecf4b22045630f6bd86f7c03d7fa0
parentdbff9375a3022685e7a02f2eac5b78aac44809cd (diff)
parent9a565fe0289c55700677e7a6d8446a1de1e77e9e (diff)
Merge branch 'maint-1.6' of https://git.nordu.net/radsecproxy into dup-dyndiscdup-dyndisc
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--radsecproxy.conf.5.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 146b237..e9a0e10 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is radsecproxy 1.6.8 from 2016-09-21.
+This is unreleased radsecproxy 1.6.9-dev.
radsecproxy is a generic RADIUS proxy that supports both UDP and TLS
(RadSec) RADIUS transports. There is also experimental support for
diff --git a/configure.ac b/configure.ac
index 90d9b09..03e452e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(radsecproxy, 1.6.8, radsecproxy@lists.nordu.net)
+AC_INIT(radsecproxy, 1.6.9-dev, radsecproxy@lists.nordu.net)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_PROG_CC
diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml
index 250c812..8466cc8 100644
--- a/radsecproxy.conf.5.xml
+++ b/radsecproxy.conf.5.xml
@@ -9,7 +9,7 @@
<application>radsecproxy.conf</application>
</refentrytitle>
<manvolnum>5</manvolnum>
- <refmiscinfo>radsecproxy 1.6.8</refmiscinfo>
+ <refmiscinfo>radsecproxy 1.6.9-dev</refmiscinfo>
</refmeta>
<refnamediv>
<refname>