[ARVADOS] updated: 2.1.0-1303-g55a5bf1f3

[Git user]

Summary of changes:
 doc/admin/upgrading.html.textile.liquid | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  55a5bf1f38d28e7f3dfe8190524b967901e30d44 (commit)
      from  33765b48e350abcd844ea9db4c718f006a6a3d7b (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 55a5bf1f38d28e7f3dfe8190524b967901e30d44
Author: Ward Vandewege <ward at jhvc.com>
Date:   Tue Sep 7 14:48:42 2021 -0400

    18112: add a note to the upgrade log.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 3c3211b61..399ec35d2 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -35,10 +35,14 @@ TODO: extract this information based on git commit messages and generate changel
 <div class="releasenotes">
 </notextile>
 
-h2(#main). development main (as of 2021-09-02)
+h2(#main). development main (as of 2021-09-07)
 
 "Upgrading from 2.2.0":#v2_2_0
 
+h3. Ubuntu 18.04 packages for arvados-api-server and arvados-workbench now conflict with ruby-bundler
+
+Ubuntu 18.04 ships with Bundler version 1.16.1, which is no longer compatible with the Gemfiles in the Arvados packages (made with Bundler 2.2.19). The Ubuntu 18.04 packages for arvados-api-server and arvados-workbench now conflict with the ruby-bundler package to work around this issue. The post-install scripts for arvados-api-server and arvados-workbench install the proper version of Bundler as a gem.
+
 h3. Removed unused @update_uuid@ endpoint for users.
 
 The @update_uuid@ endpoint was superseded by the "link accounts feature":{{site.baseurl}}/admin/link-accounts.html, so it's no longer available.

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


hooks/post-receive
--