You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/19 16:07:00 UTC

[couchdb-documentation] branch fix/swap-1-2 updated (59d5c25 -> aefe3e2)

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

jan pushed a change to branch fix/swap-1-2
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


    from 59d5c25  put 2.x-relevant documentation before 1.x-relevant documentation
     add e92dea6  feat: remove proxy docs, as they don’t work in 2.x
     add 096697d  Merge pull request #299 from apache/fix/prox
     new aefe3e2  Merge branch 'master' into fix/swap-1-2

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/config/index.rst    |  1 -
 src/config/proxying.rst | 94 -------------------------------------------------
 2 files changed, 95 deletions(-)
 delete mode 100644 src/config/proxying.rst


[couchdb-documentation] 01/01: Merge branch 'master' into fix/swap-1-2

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch fix/swap-1-2
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git

commit aefe3e27eea9bb5ea3f8b2d2606f397c4153f743
Merge: 59d5c25 096697d
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Thu Jul 19 18:06:58 2018 +0200

    Merge branch 'master' into fix/swap-1-2

 src/config/index.rst    |  1 -
 src/config/proxying.rst | 94 -------------------------------------------------
 2 files changed, 95 deletions(-)