Merge branch 'main' into dev

Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2023-08-21 15:55:00 -07:00
19 changed files with 517 additions and 93 deletions

View File

@@ -2551,7 +2551,7 @@ func TestLeafNodeOperatorBadCfg(t *testing.T) {
cfg: `
port: -1
authorization {
users = [{user: "u", password: "p"}]}
users = [{user: "u", password: "p"}]
}`,
},
{
@@ -3891,9 +3891,9 @@ func TestLeafNodeInterestPropagationDaisychain(t *testing.T) {
aTmpl := `
port: %d
leafnodes {
port: %d
}
}`
port: %d
}
`
confA := createConfFile(t, []byte(fmt.Sprintf(aTmpl, -1, -1)))
sA, _ := RunServerWithConfig(confA)