[ARVADOS] updated: 1.3.0-2382-gfecdfe882

[Git user]

Summary of changes:
 lib/controller/federation/conn.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  fecdfe882983e1cab45b204a4876ffe21e36f542 (commit)
      from  2776500c74b5e932b24734daae0b0e8cfecf9887 (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 fecdfe882983e1cab45b204a4876ffe21e36f542
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Mar 30 17:12:17 2020 -0400

    16263: UserMerge shouldn't be federated
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 6cd595e15..519ea21b9 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -443,7 +443,7 @@ func (conn *Conn) UserUpdateUUID(ctx context.Context, options arvados.UpdateUUID
 }
 
 func (conn *Conn) UserMerge(ctx context.Context, options arvados.UserMergeOptions) (arvados.User, error) {
-	return conn.chooseBackend(options.OldUserUUID).UserMerge(ctx, options)
+	return conn.local.UserMerge(ctx, options)
 }
 
 func (conn *Conn) UserActivate(ctx context.Context, options arvados.UserActivateOptions) (arvados.User, error) {

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


hooks/post-receive
--