[couchdb-ken] branch master updated (2cafa80 -> 5161e54)

[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-ken.git.


    from 2cafa80  Merge pull request #5 from apache/else
     add 950f27c  Get the list of allowed languages from the environment
     new 5161e54  Merge pull request #6 from apache/ken-query-servers

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:
 src/ken_server.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[couchdb-ken] 01/01: Merge pull request #6 from apache/ken-query-servers

[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-ken.git

commit 5161e546c7c1ce7dea2bece4017c5da45ee52f61
Merge: 2cafa80 950f27c
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Oct 17 17:26:01 2019 +0100

    Merge pull request #6 from apache/ken-query-servers
    
    Get the list of allowed languages from the environment

 src/ken_server.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)