From c2dd9c58d6d3590c519e42bb2ec8e6a56e071118 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jan 2016 02:03:41 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/sql/incremental/upd_dev_collection.sql | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 81c64d9..8c0258b 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -187,3 +187,8 @@
ALTER TABLE openvz_vm
ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
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