Merge pull request #12629 from hashicorp/backport/main/freely-assured…

…-rodent This pull request was automerged via backport-assistant
hashicorp · Apr 19, 2022 · 70cf86a · 70cf86a
2 parents 35c8d52 + 5c026d9
commit 70cf86a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/command/agent/config.go b/command/agent/config.go
@@ -1661,6 +1661,9 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
 	} else if b.Reserved != nil {
 		result.Reserved = result.Reserved.Merge(b.Reserved)
 	}
+	if b.ReserveableCores != "" {
+		result.ReserveableCores = b.ReserveableCores
+	}
 	if b.GCInterval != 0 {
 		result.GCInterval = b.GCInterval
 	}