[ARVADOS] updated: 2.1.0-214-g3a974ff0f

[Git user]

Summary of changes:
 lib/controller/federation.go      |  8 --------
 lib/controller/localdb/conn.go    | 12 ------------
 lib/controller/router/response.go |  3 ---
 3 files changed, 23 deletions(-)

       via  3a974ff0fb985fb3ea4919fedaafa906ac11623b (commit)
      from  82469cf3c2075f738acef86ee8cb9d39f49e5589 (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 3a974ff0fb985fb3ea4919fedaafa906ac11623b
Author: Nico Cesar <nico at nicocesar.com>
Date:   Thu Dec 10 15:52:13 2020 -0500

    leftovers from a bad rebase
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/federation.go b/lib/controller/federation.go
index 63f21727b..bc93cc9ea 100644
--- a/lib/controller/federation.go
+++ b/lib/controller/federation.go
@@ -165,14 +165,6 @@ func (h *Handler) validateAPItoken(req *http.Request, token string) (*CurrentUse
 		token = sp[2]
 	}
 
-<<<<<<< HEAD
-=======
-	if len(token) < 41 {
-		ctxlog.FromContext(req.Context()).Debugf("validateAPItoken(%s): The lenght of the token is not 41", token)
-		return nil, false, nil
-	}
-
->>>>>>> 611e6e5fd (container requests in the new codepath for controller)
 	user.Authorization.APIToken = token
 	var scopes string
 	err = db.QueryRowContext(req.Context(), `SELECT api_client_authorizations.uuid, api_client_authorizations.scopes, users.uuid FROM api_client_authorizations JOIN users on api_client_authorizations.user_id=users.id WHERE api_token=$1 AND (expires_at IS NULL OR expires_at > current_timestamp AT TIME ZONE 'UTC') LIMIT 1`, token).Scan(&user.Authorization.UUID, &scopes, &user.UUID)
diff --git a/lib/controller/localdb/conn.go b/lib/controller/localdb/conn.go
index 80633781c..d197675f8 100644
--- a/lib/controller/localdb/conn.go
+++ b/lib/controller/localdb/conn.go
@@ -31,29 +31,17 @@ func NewConn(cluster *arvados.Cluster) *Conn {
 	return &conn
 }
 
-<<<<<<< HEAD
 // Logout handles the logout of conn giving to the appropriate loginController
-=======
-// Logout handles the logout of conn giving to the appropiate loginController
->>>>>>> 611e6e5fd (container requests in the new codepath for controller)
 func (conn *Conn) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) {
 	return conn.loginController.Logout(ctx, opts)
 }
 
-<<<<<<< HEAD
 // Login handles the login of conn giving to the appropriate loginController
-=======
-// Login handles the logout of conn giving to the appropiate loginController
->>>>>>> 611e6e5fd (container requests in the new codepath for controller)
 func (conn *Conn) Login(ctx context.Context, opts arvados.LoginOptions) (arvados.LoginResponse, error) {
 	return conn.loginController.Login(ctx, opts)
 }
 
-<<<<<<< HEAD
 // UserAuthenticate handles the User Authentication of conn giving to the appropriate loginController
-=======
-// UserAuthenticate handles the User Authentication of conn giving to the appropiate loginController
->>>>>>> 611e6e5fd (container requests in the new codepath for controller)
 func (conn *Conn) UserAuthenticate(ctx context.Context, opts arvados.UserAuthenticateOptions) (arvados.APIClientAuthorization, error) {
 	return conn.loginController.UserAuthenticate(ctx, opts)
 }
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index f83afa1dd..df5a40c9f 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -109,8 +109,6 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
 		rtr.mungeItemFields(tmp)
 	}
 
-<<<<<<< HEAD
-=======
 	for k, v := range tmp {
 		if strings.HasSuffix(k, "_at") {
 			// Format non-nil timestamps as
@@ -150,7 +148,6 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
 			}
 		}
 	}
->>>>>>> 611e6e5fd (container requests in the new codepath for controller)
 	w.Header().Set("Content-Type", "application/json")
 	enc := json.NewEncoder(w)
 	enc.SetEscapeHTML(false)

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


hooks/post-receive
--