From 74b5bd2bfaa1d15c8e2f379b33ae601c9da2de13 Mon Sep 17 00:00:00 2001 From: Noah Slater Date: Wed, 7 Jul 2010 18:49:29 +0000 Subject: 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 --- CHANGES | 5 ++++- NEWS | 5 ++++- acinclude.m4.in | 4 ++-- 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%]) -- cgit v1.2.3