Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of djc.ochtman@gmail.com
 designates 209.85.192.173 as permitted sender)
MIME-Version: 1.0
Sender: djc.ochtman@gmail.com
In-Reply-To: <A301979F-4199-436A-8560-7AF900EBA644@apache.org>
References: <A301979F-4199-436A-8560-7AF900EBA644@apache.org>
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 7 Jul 2014 22:19:12 +0200
Message-ID: 
 <CAKmKYaB4RswqkwOa_bd7LGkLkTnMJLKoRsYACtykDR01hKNgFA@mail.gmail.com>
Subject: Re: The Merge Needs You
To: "dev@couchdb.apache.org" <dev@couchdb.apache.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Mon, Jul 7, 2014 at 9:11 PM, Robert Samuel Newson <rnewson@apache.org> w=
rote:
> The merge of bigcouch has reached a stage now where I think it=E2=80=99s =
time to merge to master.

Exciting stuff!

> I stress that after the merge to master there is still some work ahead of=
 us before a 2.0 release can be made, though it is intended that a 1.7.0 co=
uld be cut from the src/couch subdirectory if necessary (though I would rat=
her avoid doing a release before 2.0).

Since we're supposedly doing time-based releases, and 1.6.0 was
released one month ago on Thursday, and you indicate that a release
will not be possible soon after the merge, I propose that we hold off
the merge a little bit to get a 1.6.1 or 1.7.0 out, then you can land
the merge after it has branched.

Cheers,

Dirkjan