ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-22 20:41:40 +02:00
Code Issues Packages Releases Activity

Merge branch 'master' into add-influxdb2-client

Browse Source
This commit is contained in:
Christoph Kluge
2022-03-22 11:10:32 +01:00
parent 830019e67f 31f31fcece
commit 2811136fd4
33 changed files with 2194 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -8,6 +8,7 @@ require (
github.com/go-ldap/ldap/v3 v3.4.1
github.com/go-sql-driver/mysql v1.5.0
github.com/golang-jwt/jwt/v4 v4.1.0
github.com/google/gops v0.3.22
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/sessions v1.2.1
@@ -18,6 +19,7 @@ require (
github.com/vektah/gqlparser/v2 v2.1.0
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
)
<<<<<<< HEAD
require (
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
@@ -36,3 +38,5 @@ require (
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
)
=======
>>>>>>> master