Merge pull request #5361 from yinchuan/patch-2

add resource limits in salt-master.upstart to correct issuse #5323
This commit is contained in:
Thomas S Hatch 2013-06-01 11:58:44 -07:00
commit cd0f69ebbd

View File

@ -4,6 +4,7 @@ start on (net-device-up
and local-filesystems
and runlevel [2345])
stop on runlevel [!2345]
limit nofile 100000 100000
script
exec salt-master