Merge pull request #13897 from darron/patch-1

Auto commit by PR queue bot
2015-10-21 02:20:03 -07:00
parent d42f2399f4 d0e1781d2b
commit 0aa62edaf5
1 changed files with 3 additions and 0 deletions
--- a/cluster/ubuntu/master/init_conf/etcd.conf
+++ b/cluster/ubuntu/master/init_conf/etcd.conf
@@ -7,6 +7,9 @@ start on (net-device-up

 respawn

+# set max open files
+limit nofile 2048 4096
+
 pre-start script
 	# see also https://github.com/jainvipin/kubernetes-ubuntu-start
 	ETCD=/opt/bin/$UPSTART_JOB