[15/50] [abbrv] git commit: updated refs/heads/resize-root to 0eb9967

[ml...@apache.org]

CLOUDSTACK-6203: Correct documentation for KVM migration tuneables


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

Branch: refs/heads/resize-root
Commit: bbaec7bae87fde2c93568a042b8cd085b57bf0d1
Parents: e5449e2
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed Mar 5 12:41:09 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed Mar 5 12:41:09 2014 -0700

----------------------------------------------------------------------
 agent/conf/agent.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbaec7ba/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index e7e3b9c..b8b7a7c 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -77,7 +77,7 @@ domr.scripts.dir=scripts/network/domr/kvm
 
 # Busy VMs may never finish migrating, depending on environment. When its available, we will
 # want to add support for autoconvergence migration flag which should fix this. Set an upper
-# limit in seconds for how long live migration should wait, at which point VM is paused and
+# limit in milliseconds for how long live migration should wait, at which point VM is paused and
 # migration will finish quickly.  Less than 1 means disabled.
 #vm.migrate.pauseafter=0