From c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 2 Mar 2019 11:39:25 +0100 Subject: Merging upstream version 20190301. Signed-off-by: Daniel Baumann --- share/config/container.conf.in | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'share/config') diff --git a/share/config/container.conf.in b/share/config/container.conf.in index ebf91b9..b0f35cb 100644 --- a/share/config/container.conf.in +++ b/share/config/container.conf.in @@ -1,6 +1,5 @@ -# compute-tools: @NAME@ +# /etc/open-infrastructure/container/config/@NAME@.conf -[start] cnt.auto=@CNT_AUTO@ cnt.container-server=@CNT_CONTAINER_SERVER@ cnt.network-bridge=@CNT_NETWORK_BRIDGE@ @@ -16,13 +15,3 @@ machine=@MACHINE@ network-veth-extra=@NETWORK_VETH_EXTRA@ private-users=@PRIVATE_USERS@ register=@REGISTER@ - -[limit] -BlockIODeviceWeight= -BlockIOReadBandwidth= -BlockIOWeight= -BlockIOWriteBandwidth= -CPUQuota= -CPUShares= -MemoryLimit= -TasksMax= -- cgit v1.2.3