[couchdb] branch 3.x updated (5db8bfe -> 209c395)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a change to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 5db8bfe  bump docs, fauxton for 3.1.0
     add 24e00ec  Bump version number to 3.1.0
     add 1099772  allow to run 'javascript' target with other test targets in the same 'make' process
     add f5b46be  Fix python-black target for Windows
     new 209c395  Merge pull request #2854 from apache/3.x-backports-verbump

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile           | 4 +++-
 Makefile.win       | 7 ++++---
 rel/reltool.config | 2 +-
 version.mk         | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

[couchdb] 01/01: Merge pull request #2854 from apache/3.x-backports-verbump

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 209c3957a445296c3f0f0977c0dcbe3747c66d08
Merge: 5db8bfe f5b46be
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Thu Apr 30 12:39:31 2020 -0400

    Merge pull request #2854 from apache/3.x-backports-verbump
    
    3.x backports verbump

 Makefile           | 4 +++-
 Makefile.win       | 7 ++++---
 rel/reltool.config | 2 +-
 version.mk         | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)