summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2010-07-07 18:49:29 +0000
committerNoah Slater <nslater@apache.org>2010-07-07 18:49:29 +0000
commit74b5bd2bfaa1d15c8e2f379b33ae601c9da2de13 (patch)
treec13d31676a72eb93b16bb24c604b936af1523a01
parent37f492f8bd41370a4722b1adc699ae3aa6d3f46a (diff)
update trunk with version info assuming 1.0.0 passes the vote
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@961477 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES5
-rw-r--r--NEWS5
-rw-r--r--acinclude.m4.in4
3 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 2224718f..1c609a20 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,14 @@
Apache CouchDB CHANGES
======================
-Version 1.0.0
+Version 1.1.0
--------------
This version has not been released yet.
+Version 1.0.0
+--------------
+
HTTP Interface:
* Mask passwords in active tasks and logging.
diff --git a/NEWS b/NEWS
index b4fcdf32..cbda7fda 100644
--- a/NEWS
+++ b/NEWS
@@ -7,11 +7,14 @@ For details about backwards incompatible changes, see:
Each release section notes when backwards incompatible changes have been made.
-Version 1.0.0
+Version 1.1.0
--------------
This version has not been released yet.
+Version 1.0.0
+--------------
+
* 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..253831be 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -16,8 +16,8 @@ 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], [1])
m4_define([LOCAL_VERSION_REVISION], [0])
m4_define([LOCAL_VERSION_STAGE], [a])
m4_define([LOCAL_VERSION_RELEASE], [%release%])