[couchdb] branch config-default-transaction-options updated (4099167 -> 8df55da)

[va...@apache.org]

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

vatamane pushed a change to branch config-default-transaction-options
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 4099167  Allow specifying FDB transaction options
 discard c6f81e6  Update erlfdb to v1.1.0
     add 232e1d5  Report the chttpd_auth authentication db in session info
     add a5fded8  Add native encryption support
     add 43da896  Merge pull request #2826 from apache/aegis
     add 21bb444  Add a couch_views test for multiple design documents with the same map
     add 5278958  Update erlfdb to v1.1.0
     add 8df55da  Allow specifying FDB transaction 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   (4099167)
            \
             N -- N -- N   refs/heads/config-default-transaction-options (8df55da)

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:
 configure                                          |  19 ++
 rebar.config.script                                |   1 +
 rel/overlay/etc/default.ini                        |   2 +-
 rel/reltool.config                                 |   2 +
 src/{ken => aegis}/rebar.config.script             |  27 +-
 .../src/aegis.app.src}                             |  30 ++-
 src/aegis/src/aegis.erl                            |  72 ++++++
 src/aegis/src/aegis.hrl                            |  57 +++++
 .../src/ioq_app.erl => aegis/src/aegis_app.erl}    |   9 +-
 .../src/aegis_key_manager.erl}                     |  13 +-
 .../src/aegis_keywrap.erl}                         |  34 ++-
 .../src/aegis_noop_key_manager.erl}                |  18 +-
 src/aegis/src/aegis_server.erl                     | 275 +++++++++++++++++++++
 .../couch_rate_sup.erl => aegis/src/aegis_sup.erl} |  18 +-
 .../test/aegis_basic_test.erl}                     |   6 +-
 src/aegis/test/aegis_server_test.erl               | 165 +++++++++++++
 src/chttpd/src/chttpd.erl                          |   8 +
 src/chttpd/test/eunit/chttpd_session_tests.erl     |  74 ++++++
 .../test/eunit/chttpd_test.hrl}                    |   2 +
 src/couch/src/couch_httpd_auth.erl                 |   3 +-
 src/couch_views/src/couch_views_fdb.erl            |   8 +-
 src/couch_views/test/couch_views_indexer_test.erl  |  88 ++++++-
 src/fabric/include/fabric2.hrl                     |   1 +
 src/fabric/src/fabric.app.src                      |   3 +-
 src/fabric/src/fabric2_fdb.erl                     |  31 ++-
 src/fabric/src/fabric2_server.erl                  |  36 ++-
 src/fabric/test/fabric2_tx_options_tests.erl       |  32 ++-
 27 files changed, 920 insertions(+), 114 deletions(-)
 copy src/{ken => aegis}/rebar.config.script (50%)
 copy src/{couch_plugins/src/couch_plugins.app.src => aegis/src/aegis.app.src} (62%)
 create mode 100644 src/aegis/src/aegis.erl
 create mode 100644 src/aegis/src/aegis.hrl
 copy src/{ioq/src/ioq_app.erl => aegis/src/aegis_app.erl} (92%)
 copy src/{ddoc_cache/src/ddoc_cache_app.erl => aegis/src/aegis_key_manager.erl} (76%)
 rename src/{couch/src/couch_keywrap.erl => aegis/src/aegis_keywrap.erl} (84%)
 copy src/{couch_js/src/couch_js_app.erl => aegis/src/aegis_noop_key_manager.erl} (77%)
 create mode 100644 src/aegis/src/aegis_server.erl
 copy src/{couch_rate/src/couch_rate_sup.erl => aegis/src/aegis_sup.erl} (78%)
 copy src/{couch_replicator/src/couch_replicator_scheduler.hrl => aegis/test/aegis_basic_test.erl} (83%)
 create mode 100644 src/aegis/test/aegis_server_test.erl
 create mode 100644 src/chttpd/test/eunit/chttpd_session_tests.erl
 copy src/{fabric/test/fabric2_test.hrl => chttpd/test/eunit/chttpd_test.hrl} (97%)