[couchdb] branch fix-socks5-proxy-support updated (365c245 -> c9c50c3)

[ja...@apache.org]

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

jaydoane pushed a change to branch fix-socks5-proxy-support
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 365c245  Use correct socks5 proxy ibrowse options
     add dedd894  normalize some config options
     add 9337019  Merge pull request #3609 from jiahuili430/normalise-config-options
     add c9c50c3  Use correct socks5 proxy ibrowse options

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (365c245)
            \
             N -- N -- N   refs/heads/fix-socks5-proxy-support (c9c50c3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 rebar.config.script                                |   2 +-
 rel/overlay/etc/default.ini                        | 108 ++++++++++-----------
 src/chttpd/src/chttpd.erl                          |  21 ++--
 src/chttpd/src/chttpd_db.erl                       |   8 +-
 src/chttpd/src/chttpd_misc.erl                     |   2 +-
 src/chttpd/src/chttpd_prefer_header.erl            |   8 +-
 src/chttpd/src/chttpd_sup.erl                      |   7 +-
 src/chttpd/test/eunit/chttpd_util_test.erl         |  67 +------------
 src/couch/src/couch_db.erl                         |  14 +--
 src/couch/src/couch_doc.erl                        |   2 +-
 src/couch/src/couch_httpd.erl                      |   9 +-
 src/couch/src/couch_httpd_misc_handlers.erl        |   2 +-
 src/couch/src/couch_proc_manager.erl               |  11 +--
 src/couch/src/couch_query_servers.erl              |   2 +-
 src/couch/src/couch_server.erl                     |  32 +++---
 src/couch/src/couch_uuids.erl                      |   2 +-
 src/couch/test/eunit/couch_doc_json_tests.erl      |   2 +-
 src/couch_replicator/src/couch_replicator_docs.erl |  40 ++++----
 src/couch_replicator/src/couch_replicator_ids.erl  |   2 +-
 ...replicator_create_target_with_options_tests.erl |   4 +-
 src/custodian/src/custodian_util.erl               |   2 +-
 src/fabric/src/fabric_doc_attachments.erl          |   4 +-
 src/fabric/src/fabric_doc_atts.erl                 |   4 +-
 src/ioq/src/ioq.erl                                |  14 ++-
 src/mem3/src/mem3.erl                              |   2 +-
 src/mem3/src/mem3_util.erl                         |   2 +-
 src/mem3/test/eunit/mem3_util_test.erl             |   2 +-
 src/setup/src/setup_httpd.erl                      |   4 +-
 test/elixir/test/config_test.exs                   |   2 +-
 29 files changed, 172 insertions(+), 209 deletions(-)