extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-03 03:50:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into private_public_frontend

Browse Source
This commit is contained in:
Michael Quigley 2024-07-09 12:31:10 -04:00
commit 14607cd0a5
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -10,6 +10,8 @@ CHANGE: auto-update the ziti CLI version that is built in to the openziti/zrok c
CHANGE: Docker examples set HOME to enable running CLI commands in the container
FIX: Fix for environment count inheritance when using a resource count class to override global environment count (https://github.com/openziti/zrok/issues/695)
## v0.4.34
FEATURE: Linux service support for all private share modes (contribution from Stefan Adelbert @stefanadelbert)

2
controller/limits/agent.go
View File

@ -68,7 +68,7 @@ func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) {
if err != nil {
return false, err
}
if len(envs)+1 > a.cfg.Environments {
if len(envs)+1 > ul.resource.GetEnvironments() {
return false, nil
}
}