From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

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

diff --git a/install/sql/incremental/upd_0078.sql b/install/sql/incremental/upd_0078.sql
index e9948dc..ea78b87 100644
--- a/install/sql/incremental/upd_0078.sql
+++ b/install/sql/incremental/upd_0078.sql
@@ -1 +1,2 @@
 ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL DEFAULT '';
+ALTER TABLE  `web_domain` DROP INDEX `serverdomain`, ADD UNIQUE  `serverdomain` (  `server_id` , `ip_address`, `domain` );

--
Gitblit v1.9.1