tree 5b5fe16c080ea07b1eddd310f1a5213f5d739131
parent e087044be7fbf39465af3044bc8e9c3c48e33842
parent cdb3fa6696d1c4a3616e94a87a07d5ca3f8814b0
author chnyda <chnyda@mirantis.com> 1501503031 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> 1501503033 +0000

Merge "Limit number of cpu usable by docker with salt-model"