From b98be2e5bcd1abfb98a544fdad66696007925b38 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 11 Oct 2014 03:29:49 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/sql/incremental/upd_dev_collection.sql |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 68cb3ba..e60ae02 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,3 +1,10 @@
 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;
+ALTER TABLE  `client` ADD  `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER  `gender`;

--
Gitblit v1.9.1