summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2010-07-07 19:00:03 +0000
committerNoah Slater <nslater@apache.org>2010-07-07 19:00:03 +0000
commit9fdc382c35978bd729cf3953d45d30b2d2931445 (patch)
treebf70d2ed930eb095c75c582e76da4d843815d51e
parent55b4f69e63a224da5166e4a190cfceff566c4b86 (diff)
updated version info on branch for 1.0.0
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@961480 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES2
-rw-r--r--NEWS2
-rw-r--r--acinclude.m4.in6
3 files changed, 3 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 2224718f..186d9a8f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,6 @@ Apache CouchDB CHANGES
Version 1.0.0
--------------
-This version has not been released yet.
-
HTTP Interface:
* Mask passwords in active tasks and logging.
diff --git a/NEWS b/NEWS
index b4fcdf32..a2ed9741 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,6 @@ Each release section notes when backwards incompatible changes have been made.
Version 1.0.0
--------------
-This version has not been released yet.
-
* Mask passwords in active tasks and logging.
* Update mochijson2 to allow output of BigNums not in float form.
* Added support for X-HTTP-METHOD-OVERRIDE.
diff --git a/acinclude.m4.in b/acinclude.m4.in
index ccfe9da7..c62aa225 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -16,10 +16,10 @@ m4_define([LOCAL_PACKAGE_IDENTIFIER], [couchdb])
m4_define([LOCAL_PACKAGE_TARNAME], [apache-couchdb])
m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
-m4_define([LOCAL_VERSION_MAJOR], [0])
-m4_define([LOCAL_VERSION_MINOR], [12])
+m4_define([LOCAL_VERSION_MAJOR], [1])
+m4_define([LOCAL_VERSION_MINOR], [0])
m4_define([LOCAL_VERSION_REVISION], [0])
-m4_define([LOCAL_VERSION_STAGE], [a])
+m4_define([LOCAL_VERSION_STAGE], [])
m4_define([LOCAL_VERSION_RELEASE], [%release%])
m4_define([LOCAL_VERSION_PRIMARY],
[LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION])