projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c65d4fe
)
16263: UserMerge shouldn't be federated
author
Peter Amstutz <peter.amstutz@curii.com>
Mon, 30 Mar 2020 21:12:17 +0000
(17:12 -0400)
committer
Peter Amstutz <peter.amstutz@curii.com>
Mon, 13 Apr 2020 15:27:03 +0000
(11:27 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
lib/controller/federation/conn.go
patch
|
blob
|
history
diff --git
a/lib/controller/federation/conn.go
b/lib/controller/federation/conn.go
index dc676c2639729ec86383ed978e6610a30cb5fcf5..21c1560886eb7e304de206e736e6f9d06abf72df 100644
(file)
--- a/
lib/controller/federation/conn.go
+++ b/
lib/controller/federation/conn.go
@@
-464,7
+464,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) {