[couchdb] branch couch-db-updater-rename-for-consistency updated (52238bc77 -> 582ed8980)

[va...@apache.org]

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

vatamane pushed a change to branch couch-db-updater-rename-for-consistency
in repository https://gitbox.apache.org/repos/asf/couchdb.git


 discard 52238bc77 Rename NonRep -> Local and merge_conflicts -> replicated_changes
     add 4cfdf3062 Fix warning: variable bound multiple times
     add 6194cfc68 Git ignore mango .hypothesis directory
     add a4bbb87d1 Remove excl_archive_filters
     add b7de21f46 Support OTP 26 base64 decode error
     add 7f13f640c Sort lists from maps
     add 453c698a5 Convert `term_to_binary` to `?term_to_bin`
     add bf5868890 Merge pull request #4581 from apache/otp-26-compat
     add 582ed8980 Rename NonRep -> Local and merge_conflicts -> replicated_changes

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   (52238bc77)
            \
             N -- N -- N   refs/heads/couch-db-updater-rename-for-consistency (582ed8980)

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:
 .gitignore                                            |  1 +
 rel/reltool.config                                    |  1 -
 src/chttpd/src/chttpd.erl                             |  2 +-
 src/chttpd/src/chttpd_misc.erl                        |  2 +-
 src/couch/include/couch_db.hrl                        |  1 +
 src/couch/src/couch_file.erl                          |  2 +-
 src/couch/src/couch_native_process.erl                |  2 +-
 src/couch/src/couch_query_servers.erl                 |  2 +-
 src/couch/test/eunit/couch_flags_config_tests.erl     |  2 +-
 src/couch_epi/src/couch_epi.hrl                       |  3 +++
 src/couch_epi/src/couch_epi_util.erl                  |  4 +++-
 src/couch_log/src/couch_log_formatter.erl             | 14 ++++++++------
 src/couch_log/src/couch_log_trunc_io.erl              |  2 +-
 src/couch_log/test/eunit/couch_log_formatter_test.erl |  5 ++---
 src/couch_mrview/src/couch_mrview.erl                 |  2 +-
 src/couch_mrview/src/couch_mrview_util.erl            |  8 ++++----
 src/couch_pse_tests/src/cpse_util.erl                 |  4 ++--
 src/couch_replicator/src/couch_replicator_ids.erl     |  2 +-
 src/couch_replicator/src/couch_replicator_utils.erl   |  3 ++-
 src/ddoc_cache/src/ddoc_cache_value.erl               |  4 +++-
 src/dreyfus/src/dreyfus_index.erl                     |  2 +-
 src/fabric/src/fabric_view_changes.erl                |  2 +-
 src/mango/src/mango_idx.erl                           |  2 +-
 src/mem3/src/mem3_hash.erl                            |  3 ++-
 src/mem3/src/mem3_rep.erl                             |  2 +-
 src/mem3/src/mem3_util.erl                            |  2 +-
 src/nouveau/src/nouveau_util.erl                      |  2 +-
 src/smoosh/src/smoosh_persist.erl                     |  3 ++-
 28 files changed, 48 insertions(+), 36 deletions(-)