summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2011-06-03 11:30:24 +0000
committerRobert Newson <rnewson@apache.org>2011-06-03 11:30:24 +0000
commitb7e11f2ee481a351a37354cc278cb5f98a959802 (patch)
tree6257594b914c11b209606f831c542c81a89ce520
parent51b27cd943b38c3b6e0e9c25915ee3aa4f092c9a (diff)
unfreeze 1.1.x - prep for 1.1.1
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1130997 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES5
-rw-r--r--NEWS5
-rw-r--r--acinclude.m4.in4
3 files changed, 12 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 7c522b96..b4ace919 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
Apache CouchDB CHANGES
======================
+Version 1.1.1
+-------------
+
+This version has not been released yet.
+
Version 1.1.0
-------------
diff --git a/NEWS b/NEWS
index b709ef25..a49d3c19 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,11 @@ For details about backwards incompatible changes, see:
Each release section notes when backwards incompatible changes have been made.
+Version 1.1.1
+-------------
+
+This version has not been released yet.
+
Version 1.1.0
-------------
diff --git a/acinclude.m4.in b/acinclude.m4.in
index e1efe10c..e74f6336 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -18,8 +18,8 @@ m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
m4_define([LOCAL_VERSION_MAJOR], [1])
m4_define([LOCAL_VERSION_MINOR], [1])
-m4_define([LOCAL_VERSION_REVISION], [0])
-m4_define([LOCAL_VERSION_STAGE], [])
+m4_define([LOCAL_VERSION_REVISION], [1])
+m4_define([LOCAL_VERSION_STAGE], [a])
m4_define([LOCAL_VERSION_RELEASE], [%release%])
m4_define([LOCAL_VERSION_PRIMARY],
[LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION])