From 69fe1ea229e5d2c3a6ecc3fc3c5438790bfc8b05 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 23 Dec 2015 12:27:11 -0500 Subject: [PATCH] Merge branch 'jnorell/ispconfig3-master' --- install/sql/incremental/upd_dev_collection.sql | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 4c23d5f..8c0258b 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -189,3 +189,6 @@ ADD COLUMN `custom` text; ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `ssl`; + +ALTER TABLE `openvz_template` CHANGE `vmguarpages` `vmguarpages` varchar(255) DEFAULT '65536:unlimited'; +ALTER TABLE `openvz_template` CHANGE `privvmpages` `privvmpages` varchar(255) DEFAULT '131072:139264'; -- Gitblit v1.9.1