From 9bfec5a5389207cba4cdbdd7eafc692c65278ce0 Mon Sep 17 00:00:00 2001
From: Tobias Schwab <tobias.schwab@dynport.de>
Date: Fri, 28 Jun 2013 15:22:01 +0200
Subject: [PATCH] do not merge hostname from image

---
 utils.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/utils.go b/utils.go
index 5a9d02c490..50615aa2c5 100644
--- a/utils.go
+++ b/utils.go
@@ -49,9 +49,6 @@ func CompareConfig(a, b *Config) bool {
 }
 
 func MergeConfig(userConf, imageConf *Config) {
-	if userConf.Hostname == "" {
-		userConf.Hostname = imageConf.Hostname
-	}
 	if userConf.User == "" {
 		userConf.User = imageConf.User
 	}