Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B422A10440 for ; Tue, 18 Jun 2013 14:32:49 +0000 (UTC) Received: (qmail 79316 invoked by uid 500); 18 Jun 2013 14:32:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 78381 invoked by uid 500); 18 Jun 2013 14:32:32 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 76900 invoked by uid 99); 18 Jun 2013 14:32:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jun 2013 14:32:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 18EE08A70B0; Tue, 18 Jun 2013 14:32:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Tue, 18 Jun 2013 14:32:27 -0000 Message-Id: <9c0017244a4a451281ab645bb25ae435@git.apache.org> In-Reply-To: <1d24136ac48d4b1d9691ce9929e8e42f@git.apache.org> References: <1d24136ac48d4b1d9691ce9929e8e42f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/41] git commit: updated refs/heads/1832-fix-empty-attachment-name to ad774b6 housekeeping after 1.2.1, prepare for 1.2.1 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/34125be2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/34125be2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/34125be2 Branch: refs/heads/1832-fix-empty-attachment-name Commit: 34125be210bef91f4715b2e387a4a1bf8d6fab6b Parents: 5ebfa8e Author: Jan Lehnardt Authored: Thu Jan 10 23:59:51 2013 +0100 Committer: Jan Lehnardt Committed: Thu Jan 10 23:59:51 2013 +0100 ---------------------------------------------------------------------- CHANGES | 5 +++++ NEWS | 5 +++++ acinclude.m4.in | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/34125be2/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8a43648..15b23b8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ Apache CouchDB CHANGES ====================== +Version 1.2.2 +------------- + +Note that this version has not been released yet. + Version 1.2.1 ------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/34125be2/NEWS ---------------------------------------------------------------------- diff --git a/NEWS b/NEWS index 4139a65..418a319 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.2.2 +------------- + +Note that this version has not been released yet. + Version 1.2.1 ------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/34125be2/acinclude.m4.in ---------------------------------------------------------------------- diff --git a/acinclude.m4.in b/acinclude.m4.in index d9fab8f..eba97f0 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -18,7 +18,7 @@ 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], [2]) -m4_define([LOCAL_VERSION_REVISION], [1]) +m4_define([LOCAL_VERSION_REVISION], [2]) m4_define([LOCAL_VERSION_STAGE], []) m4_define([LOCAL_VERSION_RELEASE], []) m4_define([LOCAL_VERSION_PRIMARY],