Aanand Prasad d0792b49fa Merge pull request #1846 from aanand/fix-mem-limit-options ...

Fix mem_limit and memswap_limit regression
(cherry picked from commit 93cc7e375130ebaaa287bb5d7e04f59bd0d6d98e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

2015-08-11 16:00:20 +01:00

..

fixtures

Test self referencing 'file'

2015-07-03 14:14:47 +01:00

integration

Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name

2015-08-11 09:44:27 +01:00

unit

Merge pull request #1846 from aanand/fix-mem-limit-options

2015-08-11 16:00:20 +01:00

__init__.py

[pep8] flake8 run for everything, fix items from this change

2015-03-25 23:15:34 -07:00