[ARVADOS] updated: 2.1.0-1784-gfe7d00b03

Git user git at public.arvados.org
Thu Jan 6 17:03:45 UTC 2022


Summary of changes:
 doc/_includes/_branchname.liquid             | 2 +-
 doc/install/salt-vagrant.html.textile.liquid | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  fe7d00b033c675b647b5d4946dd3640165ec9f17 (commit)
      from  f30e59af90558e47a4156566d0209bc8efacd85a (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 fe7d00b033c675b647b5d4946dd3640165ec9f17
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Jan 6 12:02:37 2022 -0500

    Bugfixes: doc: show the correct branch names for all the Salt install
    methods.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/_includes/_branchname.liquid b/doc/_includes/_branchname.liquid
index 44707e3f9..7180e09ce 100644
--- a/doc/_includes/_branchname.liquid
+++ b/doc/_includes/_branchname.liquid
@@ -5,7 +5,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 {% endcomment %}
 
 {% if site.current_version and site.current_version != 'main' %}
-{% assign branchname = site.current_version | slice: 0, 3 | append: '-dev' %}
+{% assign branchname = site.current_version | slice: 1, 3 | append: '-dev' %}
 {% else %}
 {% assign branchname = 'main' %}
 {% endif %}
diff --git a/doc/install/salt-vagrant.html.textile.liquid b/doc/install/salt-vagrant.html.textile.liquid
index 8ba4b324e..19a2cd510 100644
--- a/doc/install/salt-vagrant.html.textile.liquid
+++ b/doc/install/salt-vagrant.html.textile.liquid
@@ -18,7 +18,9 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 h2(#vagrant). Vagrant
 
-This is a package-based installation method. The Salt scripts are available from the "tools/salt-install":https://github.com/arvados/arvados/tree/main/tools/salt-install directory in the Arvados git repository.
+{% include 'branchname' %}
+
+This is a package-based installation method. Start by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The Salt scripts are available in the @tools/salt-install@ directory.
 
 A @Vagrantfile@ is provided to install Arvados in a virtual machine on your computer using "Vagrant":https://www.vagrantup.com/.
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list