[v9_8] prep 9.8.7

diff --git a/CHANGES b/CHANGES
index e28729d06cf33266921e3c119c0198dd0c505d3b..6054ae831d32f6cffd62c2eff07e9c3a71f28d7a 100644 (file)
--- 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 76393bce94575078a43d47279d0efa974a55555c..962d3057f5121c0efa74d0bcf59b25bb4c0070da 100755 (executable)
--- 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 913329065b3e30cf57d0d08799b18949e3f3a908..c47301c32fd21a6c974665104234378aaa113266 100644 (file)
--- a/version
+++ b/version
@@ -8,6 +8,6 @@ DESCRIPTION=
 MAJORVER=9
 MINORVER=8
 PATCHVER=7
-RELEASETYPE=rc
-RELEASEVER=2
+RELEASETYPE=
+RELEASEVER=
 EXTENSIONS=