You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/10/22 11:27:27 UTC
git commit: updated refs/heads/master to 7eb05fa
Updated Branches:
refs/heads/master dfa0678fc -> 7eb05fa22
Bug 4071 - Fixed Typo In Default Text
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7eb05fa2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7eb05fa2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7eb05fa2
Branch: refs/heads/master
Commit: 7eb05fa22183005db611c925a14c1fa58ffebbef
Parents: dfa0678
Author: alex@alexhitchins.com <al...@alexhitchins.com>
Authored: Sat Oct 19 09:52:31 2013 +0100
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue Oct 22 05:27:06 2013 -0400
----------------------------------------------------------------------
server/src/com/cloud/configuration/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7eb05fa2/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 c2aa2e4..857fdeb 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -151,7 +151,7 @@ public enum Config {
ExtractURLExpirationInterval("Advanced", ManagementServer.class, Integer.class, "extract.url.expiration.interval", "14400", "The life of an extract URL after which it is deleted ", null),
HostStatsInterval("Advanced", ManagementServer.class, Integer.class, "host.stats.interval", "60000", "The interval (in milliseconds) when host stats are retrieved from agents.", null),
HostRetry("Advanced", AgentManager.class, Integer.class, "host.retry", "2", "Number of times to retry hosts for creating a volume", null),
- IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Defaul API port", null),
+ IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Default API port", null),
InvestigateRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "investigate.retry.interval", "60", "Time (in seconds) between VM pings when agent is disconnected", null),
MigrateRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "migrate.retry.interval", "120", "Time (in seconds) between migration retries", null),
RouterCpuMHz("Advanced", NetworkOrchestrationService.class, Integer.class, "router.cpu.mhz", String.valueOf(VpcVirtualNetworkApplianceManager.DEFAULT_ROUTER_CPU_MHZ), "Default CPU speed (MHz) for router VM.", null),