[couchdb] branch master updated (7fe8bfb -> b46df8c)

[rn...@apache.org]

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

rnewson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 7fe8bfb  Add check for repeated `partition` definitions
     add d5ec065  Import ken
     new b46df8c  Merge pull request #1910 from apache/import-cloudant-ken

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:
 rebar.config.script | 1 +
 rel/reltool.config  | 2 ++
 2 files changed, 3 insertions(+)

[couchdb] 01/01: Merge pull request #1910 from apache/import-cloudant-ken

[rn...@apache.org]

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

rnewson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit b46df8c8d3c96eadb07d540b82fcb992e6da2a82
Merge: 7fe8bfb d5ec065
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Feb 7 21:48:19 2019 +0000

    Merge pull request #1910 from apache/import-cloudant-ken
    
    Import ken from cloudant

 rebar.config.script | 1 +
 rel/reltool.config  | 2 ++
 2 files changed, 3 insertions(+)