From 68ad98fc4923604872451136c7e649de7cddccc0 Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Mon, 30 Sep 2019 14:04:08 +0100
Subject: [PATCH] Enable INI merging

---
 cmd/runmqserver/main.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/runmqserver/main.go b/cmd/runmqserver/main.go
index d826f4c..fa95caa 100644
--- a/cmd/runmqserver/main.go
+++ b/cmd/runmqserver/main.go
@@ -25,6 +25,7 @@ import (
 	"sync"
 
 	"github.com/ibm-messaging/mq-container/internal/metrics"
+	"github.com/ibm-messaging/mq-container/internal/mqinimerge"
 	"github.com/ibm-messaging/mq-container/internal/ready"
 	"github.com/ibm-messaging/mq-container/internal/tls"
 	"github.com/ibm-messaging/mq-container/pkg/containerruntimelogger"
@@ -176,11 +177,11 @@ func doMain() error {
 		return err
 	}
 
-	// err = mqinimerge.AddStanzas(name)
-	// if err != nil {
-	// 	logTermination(err)
-	// 	return err
-	// }
+	err = mqinimerge.AddStanzas(name)
+	if err != nil {
+		logTermination(err)
+		return err
+	}
 
 	err = startQueueManager(name)
 	if err != nil {