From adb0e74cf23b4d766f29ef3662751cc59046a4cc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:09:23 -0400
Subject: [PATCH] Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers

---
 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 68cb3ba..dbe5aa6 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,3 +1,9 @@
 ALTER TABLE `mail_user`
 	CHANGE `uid` `uid` int(11) NOT NULL DEFAULT '5000',
 	CHANGE `gid` `gid` int(11) NOT NULL DEFAULT '5000';
+
+ALTER TABLE `client_template` ADD `default_mailserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_webserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_dnsserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_dbserver` INT(11) NOT NULL DEFAULT 1;

--
Gitblit v1.9.1