[ARVADOS] created: 2.1.0-2259-g403afd6c3

[Git user]

        at  403afd6c31b4a76ca92e4df605b8cf15ba77b9a7 (commit)


commit 403afd6c31b4a76ca92e4df605b8cf15ba77b9a7
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 09:18:24 2022 -0400

    18995: remove dead code
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index e9c5da106..d53e7ae34 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -125,7 +125,6 @@ func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) er
 				if params.AccessKey != "" || params.SecretKey != "" {
 					if params.AccessKeyID != "" || params.SecretAccessKey != "" {
 						return fmt.Errorf("cannot use old keys (AccessKey/SecretKey) and new keys (AccessKeyID/SecretAccessKey) at the same time in %s.Volumes.%s.DriverParameters -- you must remove the old config keys", clusterID, volID)
-						continue
 					}
 					var allparams map[string]interface{}
 					err = json.Unmarshal(vol.DriverParameters, &allparams)

commit 3200837a113fda82014eae2acecd8e4ee23f528f
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 09:17:42 2022 -0400

    18995: remove erroneous return statement.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 526411c41..ff77fa043 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -770,7 +770,6 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 }
 
 func addrIsLocal(addr string) (bool, error) {
-	return true, nil
 	listener, err := net.Listen("tcp", addr)
 	if err == nil {
 		listener.Close()

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


hooks/post-receive
--