[ARVADOS] updated: 1.3.0-740-g085146e27

[Git user]

Summary of changes:
 doc/admin/config-migration.html.textile.liquid | 10 +++++++++-
 doc/admin/config.html.textile.liquid           |  4 ++--
 doc/admin/upgrading.html.textile.liquid        |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)

       via  085146e2717c4a2a3cca1081d924c34cf0b52c45 (commit)
      from  8b5dff30937a7c12dcf7cd71153770393266500d (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 085146e2717c4a2a3cca1081d924c34cf0b52c45
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Apr 12 10:28:50 2019 -0400

    13996: Improve docs a bit
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/doc/admin/config-migration.html.textile.liquid b/doc/admin/config-migration.html.textile.liquid
index 13cd7585b..11546c032 100644
--- a/doc/admin/config-migration.html.textile.liquid
+++ b/doc/admin/config-migration.html.textile.liquid
@@ -10,7 +10,7 @@ Copyright (C) The Arvados Authors. All rights reserved.
 SPDX-License-Identifier: CC-BY-SA-3.0
 {% endcomment %}
 
-Arvados is migrating to a centralized configuration file for all components.  The centralized Arvados configuration is @/etc/arvados/config.yml at .  Components that support the new centralized configuration are listed below.
+Arvados is migrating to a centralized configuration file for all components.  The centralized Arvados configuration is @/etc/arvados/config.yml at .  Components that support the new centralized configuration are listed below.  Components not listed here do not yet support centralized configuration.  During the migration period, legacy configuration files will continue to be loaded and take precedence over the centralized configuration file.
 
 h2. API server
 
@@ -33,6 +33,14 @@ $ bundle exec rake config:diff
 
 This command will also report if no migrations are required.
 
+h2. crunch-dispatch-slurm
+
+Currently only reads @InstanceTypes@ from centralized configuration.  Still requires component-specific configuration file.
+
+h2. keepstore
+
+Currently only reads @RemoteClusters@ from centralized configuration.  Still requires component-specific configuration file.
+
 h2. arvados-controller
 
 Only supports centralized config file.  No migration needed.
diff --git a/doc/admin/config.html.textile.liquid b/doc/admin/config.html.textile.liquid
index 1836aac1f..a1dcdb3bb 100644
--- a/doc/admin/config.html.textile.liquid
+++ b/doc/admin/config.html.textile.liquid
@@ -14,6 +14,6 @@ The master Arvados configuration is stored at @/etc/arvados/config.yml@
 
 See "Migrating Configuration":config-migration.html for information about migrating from legacy component-specific configuration files.
 
-<pre>
+{% codeblock as yaml %}
 {% include 'config_default_yml' %}
-</pre>
+{% endcodeblock %}
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 6e2e6cba6..09bef2a62 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -125,6 +125,10 @@ h4. Centos7 package for libpam-arvados depends on the python-pam package, which
 
 As part of story "#9945":https://dev.arvados.org/issues/9945, it was discovered that the Centos7 package for libpam-arvados was missing a dependency on the python-pam package, which is available from the EPEL repository. The dependency has been added to the libpam-arvados package. This means that going forward, the EPEL repository will need to be enabled to install libpam-arvados on Centos7.
 
+h4. New configuration
+
+Arvados is migrating to a centralized configuration file for all components.  During the migration, legacy configuration files will continue to be loaded.  See "Migrating Configuration":config-migration.html for details.
+
 h3. v1.3.0 (2018-12-05)
 
 This release includes several database migrations, which will be executed automatically as part of the API server upgrade. On large Arvados installations, these migrations will take a while. We've seen the upgrade take 30 minutes or more on installations with a lot of collections.

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


hooks/post-receive
--