From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 remoting_client/examples/openvz_template_add.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/remoting_client/examples/openvz_template_add.php b/remoting_client/examples/openvz_template_add.php
index 74eb1b9..b602000 100644
--- a/remoting_client/examples/openvz_template_add.php
+++ b/remoting_client/examples/openvz_template_add.php
@@ -32,14 +32,14 @@
 		'numproc' => '999999:999999',
 		'numtcpsock' => '7999992:7999992',
 		'numothersock' => '7999992:7999992',
-		'vmguarpages' => '65536:65536',
+		'vmguarpages' => '65536:unlimited',
 		'kmemsize' => '2147483646:2147483646',
 		'tcpsndbuf' => '214748160:396774400',
 		'tcprcvbuf' => '214748160:396774400',
 		'othersockbuf' => '214748160:396774400',
 		'dgramrcvbuf' => '214748160:396774400',
 		'oomguarpages' => '65536:65536',
-		'privvmpages' => '131072:131072',
+		'privvmpages' => '131072:139264',
 		'lockedpages' => '999999:999999',
 		'shmpages' => '65536:65536',
 		'physpages' => '0:2147483647',

--
Gitblit v1.9.1