From 469ed78a58c7184888a0ba432a1cdc4176c6c82d Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Fri, 27 Apr 2012 17:13:10 +0100 Subject: [PATCH] CS-14606: Restoring config parameter which was accidentally removed --- server/src/com/cloud/configuration/Config.java | 1 + setup/db/db/schema-302to303.sql | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 82d6dfa32dd..0c0d73eb8da 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -39,6 +39,7 @@ public enum Config { AlertSMTPHost("Alert", ManagementServer.class, String.class, "alert.smtp.host", null, "SMTP hostname used for sending out email alerts.", null), AlertSMTPPassword("Secure", ManagementServer.class, String.class, "alert.smtp.password", null, "Password for SMTP authentication (applies only if alert.smtp.useAuth is true).", null), AlertSMTPPort("Alert", ManagementServer.class, Integer.class, "alert.smtp.port", "465", "Port the SMTP server is listening on.", null), + AlertSMTPUseAuth("Alert", ManagementServer.class, String.class, "alert.smtp.useAuth", null, "If true, use SMTP authentication when sending emails.", null), AlertSMTPUsername("Alert", ManagementServer.class, String.class, "alert.smtp.username", null, "Username for SMTP authentication (applies only if alert.smtp.useAuth is true).", null), AlertWait("Alert", AgentManager.class, Integer.class, "alert.wait", null, "Seconds to wait before alerting on a disconnected agent", null), CapacityCheckPeriod("Alert", ManagementServer.class, Integer.class, "capacity.check.period", "300000", "The interval in milliseconds between capacity checks", null), diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql index 20ed63fdf5a..8bce08bf801 100755 --- a/setup/db/db/schema-302to303.sql +++ b/setup/db/db/schema-302to303.sql @@ -17,7 +17,6 @@ DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.cpu.mhz'; DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.cpu.mhz'; DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.ram.size'; DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; -DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.vlan.network'; DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.tunnel.network';