Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of dch@jsonified.com designates
 209.85.217.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAPaJBx4Ur3Om2L9SspeDfLRgvyj6=NZUdQGZMtHpH+4sXDPQyQ@mail.gmail.com>
References: 
 <CAPaJBx4Ur3Om2L9SspeDfLRgvyj6=NZUdQGZMtHpH+4sXDPQyQ@mail.gmail.com>
Date: Wed, 15 May 2013 00:21:56 +0200
Message-ID: 
 <CAL+Y1nv1=0QqhDEWuP2svHCn5Ww48EZ4p=KkvfiNjFkV=D3irw@mail.gmail.com>
Subject: Re: [REQUEST] Merge changes for CouchDB 1.3.1
From: Dave Cottlehuber <dch@jsonified.com>
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=ISO-8859-1

On 14 May 2013 19:32, Noah Slater <nslater@apache.org> wrote:
> Dear community,
>
> We plan to release CouchDB 1.3.1 this month.
>
> # Tidying up the release branch
>
> To get a list of chnages on 1.3.x since we made the 1.3.0 release, run:
>
>     git log --abbrev-commit --pretty=oneline 1.3.0..1.3.x
>
> Right now, this is showing:
>
>     869f42e COUCHDB-1788 - tolerate undefined source/target when reading
> _replicator docs
>     9d41ea8 Make cardinality of result explicit, remove join hacks
>     bd0342d Add entries to NEWS and CHANGES for documentation
>     4d939c3 Add 1.3.1 section to NEWS and CHANGES
>     5e64395 Stop couchdb test server instance after javascript tests
> complete.
>     37341af Add return value to waitForSuccess method.
>     9838eef Refactor javascript runner script to handle couchdb restarts.
> Single interpreter per test.
>     0208778 PUT call to database that is not guaranted to exist.
>     6bbb1cc Remove setup functions from test runner, only allow a single
> test to be run at a time.
>     e1bfac2 Added supplementary functions for running tests from command
> line.
>
> The CHANGES entry for 1.3.1 is showing:
>
>     *Nothing*
>
> The NEWS entry for 1.3.1 is showing:
>
>     *Nothing*
>
> Please take the time to edit these files so that they reflect the existing
> changes on this branch.
>
> # Merging fixes into master
>
> This is also the time to consider whether you have any fixes that could
> land in master, and by extension, the 1.3.x branch. If you've been working
> on a branch, please review your changes, and merge in anything that seems
> appropriate.


I'd add fixing zero-byte JSON issues as reported by Eli,
https://issues.apache.org/jira/browse/COUCHDB-1493
just needs some tests added.

A+
Dave