From eef8b0d406412ffe6622ed1f2c858540eb7f75f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jp@enix.org>
Date: Tue, 7 May 2013 11:44:38 -0700
Subject: [PATCH] propagate CpuShares in mergeConfig

---
 builder.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builder.go b/builder.go
index e835c6d390..b22c853730 100644
--- a/builder.go
+++ b/builder.go
@@ -38,6 +38,9 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
 	if userConf.MemorySwap == 0 {
 		userConf.MemorySwap = imageConf.MemorySwap
 	}
+	if userConf.CpuShares == 0 {
+		userConf.CpuShares = imageConf.CpuShares
+	}
 	if userConf.PortSpecs == nil || len(userConf.PortSpecs) == 0 {
 		userConf.PortSpecs = imageConf.PortSpecs
 	}