From: Peter Amstutz Date: Tue, 10 Dec 2019 21:14:00 +0000 (-0500) Subject: Merge branch 'master' into 15572-new-install-docs X-Git-Tag: 2.0.0~72^2~22 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db31bedb109a4d918830a910654685a9f591cf28 Merge branch 'master' into 15572-new-install-docs Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- db31bedb109a4d918830a910654685a9f591cf28 diff --cc doc/install/index.html.textile.liquid index fd15114689,527b62cf3b..efa671db8c --- a/doc/install/index.html.textile.liquid +++ b/doc/install/index.html.textile.liquid @@@ -9,7 -9,7 +9,7 @@@ Copyright (C) The Arvados Authors. All SPDX-License-Identifier: CC-BY-SA-3.0 {% endcomment %} - Arvados components run on GNU/Linux systems, and supports AWS and Azure cloud platforms as well as on-premises installs. Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS. Although Arvados development is sponsored by Veritas Genetics which offers commercial support, "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and we encourage self supported/community supported installations. -Arvados components run on GNU/Linux systems, and supports multiple cloud operating stacks. Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS. "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and self-install installations are not limited in any way. Commercial support and development are also available from "Curii Corporation.":mailto:info@curii.com ++Arvados components run on GNU/Linux systems, and supports AWS, GCP and Azure cloud platforms as well as on-premises installs. Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS. "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and self-install installations are not limited in any way. Commercial support and development are also available from "Curii Corporation.":mailto:info@curii.com Arvados components can be installed and configured in a number of different ways. diff --cc services/login-sync/Gemfile.lock index 5f163e87c3,5f163e87c3..1d89604ae1 --- a/services/login-sync/Gemfile.lock +++ b/services/login-sync/Gemfile.lock @@@ -1,7 -1,7 +1,7 @@@ PATH remote: . specs: -- arvados-login-sync (1.4.1.20190930204434) ++ arvados-login-sync (1.3.1.pre20191210204053) arvados (~> 1.3.0, >= 1.3.0) faraday (< 0.16) @@@ -23,7 -23,7 +23,7 @@@ GE i18n (~> 0) json (>= 1.7.7, < 3) jwt (>= 0.1.5, < 2) -- arvados-google-api-client (0.8.7.2) ++ arvados-google-api-client (0.8.7.3) activesupport (>= 3.2, < 5.1) addressable (~> 2.3) autoparse (~> 0.3) @@@ -60,7 -60,7 +60,7 @@@ minitest (5.11.3) mocha (1.8.0) metaclass (~> 0.0.1) -- multi_json (1.13.1) ++ multi_json (1.14.1) multipart-post (2.1.1) os (1.0.1) public_suffix (4.0.1) @@@ -85,4 -85,4 +85,4 @@@ DEPENDENCIE rake BUNDLED WITH -- 1.17.3 ++ 2.0.2