You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/10 06:24:56 UTC

[couchdb-docker] 01/01: Merge branch 'master' into persist-custom-config

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

wohali pushed a commit to branch persist-custom-config
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit 1d4f8aa9e168575e6570b6eaf0deab0b95d6a6d6
Merge: d82ce41 a1f4d9d
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Jul 10 02:24:54 2018 -0400

    Merge branch 'master' into persist-custom-config

 dev-cluster/Dockerfile | 8 ++++----
 dev/Dockerfile         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)