[couchdb-docker] branch persist-custom-config updated (d82ce41 -> 1d4f8aa)

[wo...@apache.org]

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

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


    from d82ce41  Persist custom config settings across restarts
     add aa7931f  Update Node for dev image
     add a1f4d9d  update docs deps and dev-cluster node to 8.x
     new 1d4f8aa  Merge branch 'master' into persist-custom-config

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:
 dev-cluster/Dockerfile | 8 ++++----
 dev/Dockerfile         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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

[wo...@apache.org]

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(-)