Skip to content

Commit

Permalink
Merge branch 'hotfix' of https://github.com/ClusterCockpit/cc-backend
Browse files Browse the repository at this point in the history
…into hotfix
  • Loading branch information
spacehamster87 committed Dec 17, 2024
2 parents ee2c5b5 + 212c45e commit 559ce53
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ TARGET = ./cc-backend
VAR = ./var
CFG = config.json .env
FRONTEND = ./web/frontend
VERSION = 1.4.0
VERSION = 1.4.1
GIT_HASH := $(shell git rev-parse --short HEAD || echo 'development')
CURRENT_TIME = $(shell date +"%Y-%m-%d:T%H:%M:%S")
LD_FLAGS = '-s -X main.date=${CURRENT_TIME} -X main.version=${VERSION} -X main.commit=${GIT_HASH}'
Expand Down
4 changes: 2 additions & 2 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `cc-backend` version 1.4.0
# `cc-backend` version 1.4.1

Supports job archive version 2 and database version 8.

This is a minor release of `cc-backend`, the API backend and frontend
This is a small bug fix release of `cc-backend`, the API backend and frontend
implementation of ClusterCockpit.
For release specific notes visit the [ClusterCockpit Documentation](https://clusterockpit.org/docs/release/).

Expand Down
2 changes: 1 addition & 1 deletion internal/repository/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (r *UserRepository) GetUser(username string) (*schema.User, error) {

func (r *UserRepository) GetLdapUsernames() ([]string, error) {
var users []string
rows, err := r.DB.Query(`SELECT username FROM hpc_user WHERE user.ldap = 1`)
rows, err := r.DB.Query(`SELECT username FROM hpc_user WHERE hpc_user.ldap = 1`)
if err != nil {
log.Warn("Error while querying usernames")
return nil, err
Expand Down

0 comments on commit 559ce53

Please sign in to comment.