GeezerVison is showing github.com — Fixed the applicationcontext.xml because I removed a class. oh kelve… · feuhaps/cloudstack@486e0d0
File treeExpand file treeCollapse file tree Open diff view settings server/src/com/cloud/configuration
Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: client/tomcatconf/applicationContext.xml.in -1Lines changed: 0 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 805 | 805 | Misc components | 806 | 806 | --> | 807 | 807 | <bean id="actionEventUtils" class="com.cloud.event.ActionEventUtils" /> | 808 | | - <bean id="agentMonitor" class="com.cloud.agent.manager.AgentMonitor" /> | 809 | 808 | <bean id="alertGenerator" class="com.cloud.event.AlertGenerator" /> | 810 | 809 | <bean id="apiDBUtils" class="com.cloud.api.ApiDBUtils" /> | 811 | 810 | <bean id="apiDiscoveryServiceImpl" class="org.apache.cloudstack.discovery.ApiDiscoveryServiceImpl" /> | |
Collapse file Copy file name to clipboardExpand all lines: developer/pom.xml +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 26 | 26 | <groupId>mysql</groupId> | 27 | 27 | <artifactId>mysql-connector-java</artifactId> | 28 | 28 | <version>${cs.mysql.version}</version> | | 29 | + <scope>runtime</scope> | 29 | 30 | </dependency> | 30 | 31 | <dependency> | 31 | 32 | <groupId>commons-dbcp</groupId> | |
Collapse file Copy file name to clipboardExpand all lines: server/src/com/cloud/configuration/Config.java +5-1Lines changed: 5 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -165,6 +165,10 @@ public enum Config { | 165 | 165 | IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Defaul API port", null), | 166 | 166 | InvestigateRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "investigate.retry.interval", "60", "Time (in seconds) between VM pings when agent is disconnected", null), | 167 | 167 | MigrateRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "migrate.retry.interval", "120", "Time (in seconds) between migration retries", null), | | 168 | + PingInterval("Advanced", AgentManager.class, Integer.class, "ping.interval", "60", "Ping interval in seconds", null), | | 169 | + PingTimeout("Advanced", AgentManager.class, Float.class, "ping.timeout", "2.5", "Multiplier to ping.interval before announcing an agent has timed out", null), | | 170 | + ClusterDeltaSyncInterval("Advanced", AgentManager.class, Integer.class, "sync.interval", "60", "Cluster Delta sync interval in seconds", null), | | 171 | + Port("Advanced", AgentManager.class, Integer.class, "port", "8250", "Port to listen on for agent connection.", null), | 168 | 172 | RouterCpuMHz("Advanced", NetworkManager.class, Integer.class, "router.cpu.mhz", String.valueOf(VpcVirtualNetworkApplianceManager.DEFAULT_ROUTER_CPU_MHZ), "Default CPU speed (MHz) for router VM.", null), | 169 | 173 | RestartRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "restart.retry.interval", "600", "Time (in seconds) between retries to restart a vm", null), | 170 | 174 | RouterStatsInterval("Advanced", NetworkManager.class, Integer.class, "router.stats.interval", "300", "Interval (in seconds) to report router statistics.", null), | @@ -430,7 +434,7 @@ public enum Config { | 430 | 434 | InternalLbVmServiceOfferingId("Advanced", ManagementServer.class, String.class, "internallbvm.service.offering", null, "Uuid of the service offering used by internal lb vm; if NULL - default system internal lb offering will be used", null), | 431 | 435 | ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands", "false", "If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the agent side." + | 432 | 436 | " If set to false, these commands become asynchronous. Default value is false.", null), | 433 | | - ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." + | | 437 | + ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." + | 434 | 438 | " If set to false, these commands become asynchronous. Default value is false.", null), | 435 | 439 |
| 436 | 440 | UCSSyncBladeInterval("Advanced", ManagementServer.class, Integer.class, "ucs.sync.blade.interval", "3600", "the interval cloudstack sync with UCS manager for available blades in case user remove blades from chassis without notifying CloudStack", null); | |
|