cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject git commit: updated refs/heads/4.3-forward to 7255e50
Date Thu, 30 Jan 2014 08:57:47 GMT
Updated Branches:
  refs/heads/4.3-forward 8024f2cc7 -> 7255e50f2


CLOUDSTACK-5966 Updated service monitoring config to start by default.
Global settings EnableServiceMonitoring param set to true


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7255e50f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7255e50f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7255e50f

Branch: refs/heads/4.3-forward
Commit: 7255e50f2051aff1cb5e1991e2dde4ef48f57454
Parents: 8024f2c
Author: Jayapal <jayapal@apache.org>
Authored: Thu Jan 30 14:16:58 2014 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Thu Jan 30 14:20:21 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 2 +-
 setup/db/db/schema-421to430.sql                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7255e50f/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index da79995..2d55f46 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -105,7 +105,7 @@ public enum Config {
 	SecurityGroupDefaultAdding("Network", ManagementServer.class, Boolean.class, "network.securitygroups.defaultadding",
"true", "If true, the user VM would be added to the default security group by default", null),
 
 	GuestOSNeedGatewayOnNonDefaultNetwork("Network", NetworkOrchestrationService.class, String.class,
"network.dhcp.nondefaultnetwork.setgateway.guestos", "Windows", "The guest OS's name start
with this fields would result in DHCP server response gateway information even when the network
it's on is not default network. Names are separated by comma.", null),
-    EnableServiceMonitoring("Network", ManagementServer.class, Boolean.class, "network.router.enableserviceMonitoring",
"false", "service monitoring in router enable/disable option, default false", null),
+    EnableServiceMonitoring("Network", ManagementServer.class, Boolean.class, "network.router.enableserviceMonitoring",
"true", "service monitoring in router enable/disable option, default true", null),
 
 	//VPN
 	RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length",
"24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7255e50f/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 1ed6c6b..4f8a52e 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -1089,5 +1089,4 @@ CREATE VIEW `cloud`.`user_vm_view` AS
            left join
         `cloud`.`user_vm_details` `custom_ram_size`  ON (((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`)
and (`custom_ram_size`.`name` = 'memory')));
 
-INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description,
default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'network.router.EnableServiceMonitoring',
'false', 'service monitoring in router enable/disable option, default false', 'false') ON
DUPLICATE KEY UPDATE category='NetworkManager';
 


Mime
View raw message