Revert "Merge branch 'bug/swap' into 'master'"

This reverts merge request !94
projecteru2 · May 16, 2017 · f17ab48 · f17ab48
1 parent c289a75
commit f17ab48
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go
@@ -676,7 +676,7 @@ func (c *calcium) makeContainerOptions(index int, quota map[string]int, specs ty
 	} else {
 		resource = enginecontainer.Resources{
 			Memory:     opts.Memory,
-			MemorySwap: opts.Memory + 1, // MemorySwap == Memory means unlimited MemorySwap
+			MemorySwap: opts.Memory,
 			CPUPeriod:  utils.CpuPeriodBase,
 			CPUQuota:   int64(opts.CPUQuota * float64(utils.CpuPeriodBase)),
 			Ulimits:    ulimits,