[ARVADOS] updated: 1.3.0-1544-gde47033cb

[Git user]

Summary of changes:
 doc/admin/config-migration.html.textile.liquid | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

       via  de47033cb700ba5655dc6cfde77b888e8a94e87f (commit)
      from  82ef8e6c9b95804159e199d7dd9128da82366a50 (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 de47033cb700ba5655dc6cfde77b888e8a94e87f
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Tue Aug 20 17:27:13 2019 -0400

    14715: Fixes keepproxy config migration doc
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/doc/admin/config-migration.html.textile.liquid b/doc/admin/config-migration.html.textile.liquid
index ae85876fd..15925fbac 100644
--- a/doc/admin/config-migration.html.textile.liquid
+++ b/doc/admin/config-migration.html.textile.liquid
@@ -64,22 +64,9 @@ Currently only reads @RemoteClusters@ from centralized configuration.  Still req
 
 h2(#keepproxy). keepproxy
 
-The legacy keepproxy config is stored at @/etc/arvados/keepproxy/keepproxy.yml@ by default and will continue to take precedence over the cluster config, unless removed. Also, a legacy keepproxy config in a different path can still be used with the @-legacy-keepproxy-config=path/to/legacy/config@ keepproxy command line argument. If the @-legacy-keepproxy-config@ command line argument is provided, this will take precedence over @/etc/arvados/keepproxy/keepproxy.yml@ and the cluster config. If migrating to the centralized config, @keepproxy.yml@ should be moved out of the way and/or deleted and the @-legacy-keepproxy-config@ command line argument should not be used.
-
-Configuration via individual command line arguments is no longer available. The following table maps former keepproxy command line arguments and legacy config values to their equivalent representation in the centralized config, which may need to be set manually.
-
-table(table table-bordered table-condensed).
-|*Command Line*|*Legacy keepproxy.yml*|*Centralized config.yml*|
-|-listen|Listen|Services.Keepproxy.InternalURLs|
-|-no-get|DisableGet|N/A|
-|-no-put|DisablePut|N/A|
-|-default-replicas|DefaultReplicas|Collections.DefaultReplication|
-|-pid|PIDFile|N/A|
-|N/A|Debug|SystemLogs.LogLevel|
-|-timeout|Timeout|API.KeepServiceRequestTimeout|
-|-management-token|ManagementToken|ManagementToken|
-
-Note that some options are no longer supported. If you are still using the legacy config at @/etc/arvados/keepproxy/keepproxy.yml@ and @DisableGet@ or @DisablePut@ are set to true or @PIDFile@ has a value, keepproxy will produce an error and fail to start.
+The legacy keepproxy config (loaded from @/etc/arvados/keepproxy/keepproxy.yml@ or a different location specified via -legacy-keepproxy-config command line argument) takes precedence over the centralized config. After you migrate everything from the legacy config to the centralized config, you should delete @/etc/arvados/keepproxy/keepproxy.yml@ and stop using the -legacy-keepproxy-config argument.
+
+Also, configuration via individual command line arguments is no longer available and the @DisableGet@, @DisablePut@, and @PIDFile@ configuration options are no longer supported. If you are still using the legacy config at @/etc/arvados/keepproxy/keepproxy.yml@ and @DisableGet@ or @DisablePut@ are set to true or @PIDFile@ has a value, keepproxy will produce an error and fail to start.
 
 h2. arvados-controller
 

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


hooks/post-receive
--