From 4070036454731508a7caa56d19e0d5bc9e64614c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 12:57:21 -0500
Subject: [PATCH] Updated and merged language files.

---
 install/sql/incremental/upd_dev_collection.sql |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 88b830e..32e85bd 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -206,9 +206,10 @@
 
 --- DNSSEC-Implementation by dark alex
 --- TODO: Review and resolve conflicts if more has been done in that column
-ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
+ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
 
 ALTER TABLE `dns_soa`
 	ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
 	ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
-	ADD COLUMN `dnssec_info` TEXT NULL;
+	ADD COLUMN `dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
+	ADD COLUMN `dnssec_info` TEXT NULL;
\ No newline at end of file

--
Gitblit v1.9.1