16263: UserMerge shouldn't be federated

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
arvados · Mar 30, 2020 · fecdfe8 · fecdfe8
1 parent 2776500
commit fecdfe8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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) {