From 231d741842275c4efa646becc65fc7a914f5f853 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 27 Jan 2014 10:59:48 -0800 Subject: [PATCH] [v9_8] prep 9.8.7 --- CHANGES | 2 ++ configure | 5 ----- version | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index e28729d06c..6054ae831d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + --- 9.8.7 released --- + --- 9.8.7rc2 released --- 3710. [bug] Address double dns_zone_detach when switching to diff --git a/configure b/configure index 76393bce94..962d3057f5 100755 --- a/configure +++ b/configure @@ -14,11 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# <<<<<<< HEAD -# $Id: COPYRIGHT,v 1.17.14.2 2012/01/04 23:46:18 tbox Exp $ -# -# ======= -# >>>>>>> f0f4bda... [v9_9] correct copyrights and attributions # From configure.in Revision: 1.512.8.15 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. diff --git a/version b/version index 913329065b..c47301c32f 100644 --- a/version +++ b/version @@ -8,6 +8,6 @@ DESCRIPTION= MAJORVER=9 MINORVER=8 PATCHVER=7 -RELEASETYPE=rc -RELEASEVER=2 +RELEASETYPE= +RELEASEVER= EXTENSIONS=