From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
interface/web/vm/templates/openvz.conf.tpl | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/interface/web/vm/templates/openvz.conf.tpl b/interface/web/vm/templates/openvz.conf.tpl
index 06e6ac5..5bdd385 100644
--- a/interface/web/vm/templates/openvz.conf.tpl
+++ b/interface/web/vm/templates/openvz.conf.tpl
@@ -45,5 +45,6 @@
NAMESERVER="{tmpl_var name='nameserver'}"
# alternative meminfo: "pages:256000"
MEMINFO="privvmpages:1"
+# SWAPPAGES="{tmpl_var name='swappages'}"
CAPABILITY="{tmpl_var name='capability'}"
--
Gitblit v1.9.1