bug: merge ReservableCores in clientConfig

hashicorp · Feb 10, 2022 · ae1042c · ae1042c
1 parent 05b9900
commit ae1042c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/command/agent/config.go b/command/agent/config.go
@@ -1662,6 +1662,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
 	}