[ARVADOS] updated: 2.1.0-2439-g0dab89df8

[Git user]

Summary of changes:
 build/run-build-packages.sh                        |  2 +-
 build/run-tests.sh                                 |  7 ++++
 cmd/arvados-server/cmd.go                          |  2 +
 .../arvados-server}/keep-balance.service           |  4 +-
 lib/boot/supervisor.go                             |  2 +-
 sdk/python/tests/run_test_server.py                |  3 ++
 services/api/app/views/static/intro.html.erb       |  2 +-
 .../api/app/views/static/login_failure.html.erb    |  2 +-
 services/keep-balance/balance.go                   |  2 +-
 services/keep-balance/balance_run_test.go          |  2 +-
 services/keep-balance/balance_test.go              |  2 +-
 services/keep-balance/block_state.go               |  2 +-
 services/keep-balance/block_state_test.go          |  2 +-
 services/keep-balance/change_set.go                |  2 +-
 services/keep-balance/change_set_test.go           |  2 +-
 services/keep-balance/collection.go                |  2 +-
 services/keep-balance/collection_test.go           |  2 +-
 services/keep-balance/integration_test.go          |  2 +-
 services/keep-balance/keep_service.go              |  2 +-
 services/keep-balance/main.go                      | 39 ++++++--------------
 services/keep-balance/main_test.go                 |  6 +--
 services/keep-balance/metrics.go                   |  2 +-
 services/keep-balance/server.go                    |  2 +-
 .../multi_host/aws/pillars/nginx_passenger.sls     |  2 +
 .../multi_host/aws/states/passenger_rvm.sls        | 43 ++++++++++++++++++++++
 .../multiple_hostnames/pillars/nginx_passenger.sls |  2 +
 .../multiple_hostnames/states/passenger_rvm.sls    | 43 ++++++++++++++++++++++
 .../single_hostname/pillars/nginx_passenger.sls    |  2 +
 .../single_hostname/states/passenger_rvm.sls       | 43 ++++++++++++++++++++++
 tools/salt-install/provision.sh                    |  9 ++++-
 30 files changed, 188 insertions(+), 51 deletions(-)
 rename {services/keep-balance => cmd/arvados-server}/keep-balance.service (87%)
 create mode 100644 tools/salt-install/config_examples/multi_host/aws/states/passenger_rvm.sls
 create mode 100644 tools/salt-install/config_examples/single_host/multiple_hostnames/states/passenger_rvm.sls
 create mode 100644 tools/salt-install/config_examples/single_host/single_hostname/states/passenger_rvm.sls

       via  0dab89df8040f203a33bc1922df0ff893791def7 (commit)
       via  9171d310942ea3c8e3bed3e21a1c2d0604e93ad6 (commit)
       via  e7242cf3bc556f3885381ce1a978202a09764927 (commit)
       via  402d882ea36afbaff953e60594e470808ebf0579 (commit)
       via  6bff9da1ce3a4348a3700ce83cc4215ded9a6b9c (commit)
       via  f2c2cb93161f2a50c23e6e6ebbdf2bb879e05da2 (commit)
       via  45498f07785ef3d22e6dd4b9bdee69220ed134e3 (commit)
       via  d70eee2298afe8d082c72429a919bd94523c6bde (commit)
       via  4e8c19d6601b406b5624ffd152fa29385794192f (commit)
       via  f8f076dd5576da6e1ad09be10f1e2a59554e388c (commit)
       via  68200af27ac67509f15fea09459ff1f0d1b703f6 (commit)
       via  99cb1578d99ab1926010e0c5951b03da70ca1990 (commit)
       via  f959aac33c7f09df2975a81b8a1cd1eeeb38af6f (commit)
       via  0b4945244d55214b331adabce38e33800b55b3e1 (commit)
       via  267c02294d7d5c1f161921f9dade6b692a7029a2 (commit)
       via  afd7310c711cf121cdc299eaef149379ef04927c (commit)
      from  00542ded608212e8245429001f1a0a0a736f2e71 (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 0dab89df8040f203a33bc1922df0ff893791def7
Merge: 00542ded6 9171d3109
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 9 09:49:36 2022 -0400

    18794: Merge branch 'main'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc cmd/arvados-server/cmd.go
index 342446a81,c9a91c872..ae1e3fbee
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -21,8 -21,8 +21,9 @@@ import 
  	"git.arvados.org/arvados.git/lib/install"
  	"git.arvados.org/arvados.git/lib/lsf"
  	"git.arvados.org/arvados.git/lib/recovercollection"
 +	"git.arvados.org/arvados.git/sdk/go/health"
  	"git.arvados.org/arvados.git/services/githttpd"
+ 	keepbalance "git.arvados.org/arvados.git/services/keep-balance"
  	keepweb "git.arvados.org/arvados.git/services/keep-web"
  	"git.arvados.org/arvados.git/services/keepproxy"
  	"git.arvados.org/arvados.git/services/keepstore"

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


hooks/post-receive
--