From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 30 Nov 2015 16:36:10 +0000 (+0100)
Subject: Merge branch 'master' of git.onelab.eu:/git/nodeconfig
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=9ca413e51299fcc3b46178385bdb35dd5510e0b4;p=nodeconfig.git

Merge branch 'master' of git.onelab.eu:/git/nodeconfig
---

diff --git a/PlanetLabConf/sysctl.conf b/PlanetLabConf/sysctl.conf
index ce6f512..52db593 100644
--- a/PlanetLabConf/sysctl.conf
+++ b/PlanetLabConf/sysctl.conf
@@ -28,3 +28,5 @@ net.ipv4.tcp_rmem = 4096 87380 4194304
 net.ipv4.tcp_wmem = 4096 16384 4194304
 net.netfilter.nf_conntrack_icmp_timeout = 60
 
+fs.inotify.max_user_watches = 81920
+fs.inotify.max_user_instances = 1024