[ARVADOS] updated: 2.1.0-315-gf6519a2ff

[Git user]

Summary of changes:
 doc/admin/federation.html.textile.liquid | 2 ++
 1 file changed, 2 insertions(+)

       via  f6519a2ffd957ed31d8a8c92da2f1d4ffed71b04 (commit)
       via  b5c47e5ca546f893caa6189671966d98af6665ab (commit)
      from  64f732dbb2c0fac4cd108f142f28d6d2efeae324 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f6519a2ffd957ed31d8a8c92da2f1d4ffed71b04
Merge: 64f732dbb b5c47e5ca
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Feb 2 11:12:06 2021 -0500

    Merge branch '16974-remote-clusters-and-activate-users-doc-take2'
    
    closes #16974
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --cc doc/admin/federation.html.textile.liquid
index c2e0e4442,bf799dcd5..7e149c360
--- a/doc/admin/federation.html.textile.liquid
+++ b/doc/admin/federation.html.textile.liquid
@@@ -36,8 -36,10 +36,10 @@@ Clusters
  
  Similar settings should be added to @clsr2@ & @clsr3@ hosts, so that all clusters in the federation can talk to each other.
  
 -The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation.  User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/activation.html.  In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account.
 +The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation.  User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/user-management.html.  In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account.
  
+ Note: The @Proxy:@ variable is intended for future use, and should always be set to @true at .
+ 
  h2(#LoginCluster). User management
  
  A federation of clusters can be configured to use a separate user database per cluster, or delegate a central cluster to manage the database.

-----------------------------------------------------------------------


hooks/post-receive
--