Merge pull request kubernetes#13897 from darron/patch-1

Auto commit by PR queue bot
bgrant0607 · Oct 21, 2015 · 0aa62ed · 0aa62ed
2 parents d42f239 + d0e1781
commit 0aa62ed
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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