[ARVADOS] updated: 2.2.1-5-gfdc7a360c

[Git user]

Summary of changes:
 doc/install/arvbox.html.textile.liquid | 4 ++--
 doc/install/salt.html.textile.liquid   | 2 +-
 tools/arvbox/bin/arvbox                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

       via  fdc7a360c5213161a15edc14fb159a6a124f6451 (commit)
       via  122a76bc189a4a1ccbc239316dfaf32fba90eabb (commit)
      from  0528bcd2999f0ba4abafe9e074de0068c4a5f619 (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 fdc7a360c5213161a15edc14fb159a6a124f6451
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jul 14 14:08:42 2021 -0400

    Update salt install doc to link to 2.2 branch.
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/install/salt.html.textile.liquid b/doc/install/salt.html.textile.liquid
index a9ee08fb8..0a5a168b9 100644
--- a/doc/install/salt.html.textile.liquid
+++ b/doc/install/salt.html.textile.liquid
@@ -19,7 +19,7 @@ To ease the installation of the various Arvados components, we have developed a
 
 Saltstack is a Python-based, open-source software for event-driven IT automation, remote task execution, and configuration management. It can be used in a master/minion setup or master-less.
 
-This is a package-based installation method. The Salt scripts to install and configure Arvados using this formula are available at the "tools/salt-install":https://github.com/arvados/arvados/tree/master/tools/salt-install directory in the Arvados git repository.
+This is a package-based installation method. The Salt scripts to install and configure Arvados using this formula are available at the "tools/salt-install":https://github.com/arvados/arvados/tree/2.2-dev/tools/salt-install directory in the Arvados git repository.
 
 h2(#saltstack). Install Saltstack
 

commit 122a76bc189a4a1ccbc239316dfaf32fba90eabb
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jul 14 14:01:34 2021 -0400

    Arvbox in 2.2 branch specifies 2.2 branch.
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/install/arvbox.html.textile.liquid b/doc/install/arvbox.html.textile.liquid
index 8b3994edd..bf08f5091 100644
--- a/doc/install/arvbox.html.textile.liquid
+++ b/doc/install/arvbox.html.textile.liquid
@@ -14,9 +14,9 @@ Arvbox is a Docker-based self-contained development, demonstration and testing e
 h2. Quick start
 
 <pre>
-$ curl -O https://git.arvados.org/arvados.git/blob_plain/refs/heads/main:/tools/arvbox/bin/arvbox
+$ curl -O https://git.arvados.org/arvados.git/blob_plain/refs/heads/2.2-dev:/tools/arvbox/bin/arvbox
 $ chmod +x arvbox
-$ ./arvbox start localdemo
+$ ./arvbox start localdemo 2.2.1
 $ ./arvbox adduser demouser demo at example.com
 </pre>
 
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index ba3f2cd07..c5a30be92 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -53,11 +53,11 @@ if test -z "$WORKBENCH2_ROOT" ; then
 fi
 
 if test -z "$ARVADOS_BRANCH" ; then
-    ARVADOS_BRANCH=main
+    ARVADOS_BRANCH=2.2-dev
 fi
 
 if test -z "$WORKBENCH2_BRANCH" ; then
-    WORKBENCH2_BRANCH=main
+    WORKBENCH2_BRANCH=2.2-dev
 fi
 
 PG_DATA="$ARVBOX_DATA/postgres"

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


hooks/post-receive
--