From 796661c563939605d8c7ba7e01b7ecf62f9cd1cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 22 Oct 2015 07:59:09 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/sql/incremental/upd_dev_collection.sql | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index bbf80e6..b68fa90 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -168,3 +168,9 @@
ALTER TABLE `web_domain` ADD COLUMN `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n' AFTER `seo_redirect`;
ALTER TABLE openvz_ip ADD COLUMN `additional` VARCHAR(255) NOT NULL DEFAULT 'n';
+
+ALTER TABLE openvz_template ADD COLUMN `custom` text;
+
+ALTER TABLE openvz_vm
+ ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
+ ADD COLUMN `custom` text;
--
Gitblit v1.9.1