Add note about upstart to resource limits documentation

This commit is contained in:
Erik Johnson 2013-12-30 11:43:58 -06:00
parent b3b6c0bcee
commit 0fe0caebc3

View File

@ -75,7 +75,11 @@ can simply be appended to ``/etc/security/limits.conf``.
As with any change to resource limits, it is best to stay logged into your
current shell and open another shell to run ``ulimit -n`` again and verify that
the changes were applied correctly.
the changes were applied correctly. Additionally, if your master is running
upstart, it may be necessary to specify the ``nofile`` limit in
``/etc/default/salt-master`` if upstart isn't respecting your resource limits::
limit nofile 4096 4096
.. note::