From f382f091aa97d10056b4c433aa55298fece010d4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:16:30 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

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

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
new file mode 100644
index 0000000..e60ae02
--- /dev/null
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -0,0 +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