From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Tue, 8 Oct 2019 19:21:32 +0000 (-0400)
Subject: Merge branch 'master' into 15531-logincluster-migrate
X-Git-Tag: 2.0.0~171^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/400210f8c9d8b111a3efdaa76c8be579ea5666cb

Merge branch 'master' into 15531-logincluster-migrate

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

400210f8c9d8b111a3efdaa76c8be579ea5666cb
diff --cc doc/_config.yml
index 314b5b5cd3,c4fad997f1..0ae26584e8
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@@ -150,8 -150,6 +150,7 @@@ navbar
        - admin/index.html.textile.liquid
      - Configuration:
        - admin/config.html.textile.liquid
 +      - admin/federation.html.textile.liquid
-       - admin/collection-managed-properties.html.textile.liquid
      - Upgrading and migrations:
        - admin/upgrading.html.textile.liquid
        - admin/config-migration.html.textile.liquid
@@@ -171,12 -171,13 +170,16 @@@
        - admin/cloudtest.html.textile.liquid
      - Data Management:
        - admin/collection-versioning.html.textile.liquid
+       - admin/collection-managed-properties.html.textile.liquid
+       - admin/keep-balance.html.textile.liquid
+     - Other:
+       - admin/federation.html.textile.liquid
        - admin/controlling-container-reuse.html.textile.liquid
        - admin/logs-table-management.html.textile.liquid
 +    - Other:
        - admin/troubleshooting.html.textile.liquid
 +      - install/migrate-docker19.html.textile.liquid
 +      - admin/upgrade-crunch2.html.textile.liquid
    installguide:
      - Overview:
        - install/index.html.textile.liquid