From 11dcb8751214fe2740430b885bde3ffc69f9c5db Mon Sep 17 00:00:00 2001
From: Alex Holyoake <44803515+aholyoake-bc@users.noreply.github.com>
Date: Tue, 15 Feb 2022 13:36:37 +0000
Subject: [PATCH] config: merge ReservableCores in clientConfig (#12044)

---
 command/agent/config.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/agent/config.go b/command/agent/config.go
index c355eea0d..e3a6afbc0 100644
--- 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
 	}