Merge branch 'revert-2e0cec32' into 'master'

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

See merge request !97

Author: CMGS

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,