From: Paul Querna <pquerna@apache.org>
Date: Wed, 21 Jul 2010 18:32:10 +0000 (+0000)
Subject: Roll on to 2.2.17-dev
X-Git-Tag: 2.2.17~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abe692cf787b9427c275ac574a95d57bd85197f7;p=thirdparty%2Fapache%2Fhttpd.git

Roll on to 2.2.17-dev


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@966352 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a68ffc7d7de..f808e00365c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.17
+
 Changes with Apache 2.2.16
 
   *) SECURITY: CVE-2010-1452 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 28e12b0b6fd..a6b4eefbaff 100644
--- a/STATUS
+++ b/STATUS
@@ -23,7 +23,8 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
-    2.2.16  : In maintenance
+    2.2.17  : In maintenance
+    2.2.16  : Tagged July 21, 2010.
     2.2.15  : Released March 6, 2010.
     2.2.14  : Released October 3, 2009.
     2.2.13  : Released August 8, 2009.
diff --git a/include/ap_release.h b/include/ap_release.h
index 0bbd9dc9662..28441b5d69c 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   16
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   17
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"