[ARVADOS] updated: 2.1.0-436-gde8b9f78c

[Git user]

Summary of changes:
 lib/controller/federation/conn.go | 2 +-
 lib/controller/rpc/conn.go        | 4 ++--
 sdk/go/arvados/api.go             | 2 +-
 sdk/go/arvadostest/api.go         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

       via  de8b9f78c6dcc82301c364781613fcc177e5daee (commit)
      from  e6871442fae8acf2cad629a97697d9f2e2ec44b0 (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 de8b9f78c6dcc82301c364781613fcc177e5daee
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Feb 10 16:39:17 2021 -0500

    17119: FIXME x
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 4f1efdb56..31faa04b8 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -422,7 +422,7 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOpt
 	return conn.chooseBackend(options.UUID).GroupContents(ctx, options)
 }
 
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
 	return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
 }
 
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index e44a8e2d3..36411adfa 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -451,9 +451,9 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOpt
 	return resp, err
 }
 
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
 	ep := arvados.EndpointGroupShared
-	var resp arvados.GroupList
+	var resp arvados.ObjectList
 	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
 	return resp, err
 }
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 500a80245..108870f30 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -237,7 +237,7 @@ type API interface {
 	GroupGet(ctx context.Context, options GetOptions) (Group, error)
 	GroupList(ctx context.Context, options ListOptions) (GroupList, error)
 	GroupContents(ctx context.Context, options ContentsOptions) (ObjectList, error)
-	GroupShared(ctx context.Context, options SharedOptions) (GroupList, error)
+	GroupShared(ctx context.Context, options SharedOptions) (ObjectList, error)
 	GroupDelete(ctx context.Context, options DeleteOptions) (Group, error)
 	GroupUntrash(ctx context.Context, options UntrashOptions) (Group, error)
 	SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, error)
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index 158bcda09..f53e929a1 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -149,9 +149,9 @@ func (as *APIStub) GroupContents(ctx context.Context, options arvados.ContentsOp
 	as.appendCall(ctx, as.GroupContents, options)
 	return arvados.ObjectList{}, as.Error
 }
-func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (map[string]interface{}, error) {
+func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
 	as.appendCall(ctx, as.GroupShared, options)
-	return nil, as.Error
+	return arvados.ObjectList{}, as.Error
 }
 func (as *APIStub) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
 	as.appendCall(ctx, as.GroupDelete, options)

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


hooks/post-receive
--