[2/2] git commit: updated refs/heads/4.3 to 66d0b3d

[an...@apache.org]

CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
(cherry picked from commit 661a19bde3bf9726954f5ba88b8830f8c5a17926)

Signed-off-by: Animesh Chaturvedi <an...@apache.org>


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

Branch: refs/heads/4.3
Commit: 66d0b3d45bda73205b59693baeeefdf27e6c9c66
Parents: 7ca27f6
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 16:03:52 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Tue Jan 28 15:06:54 2014 -0800

----------------------------------------------------------------------
 agent/conf/agent.properties | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66d0b3d4/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 5f5f368..8bd9756 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
 # for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
 # on,run virsh capabilities for more details.
 # guest.cpu.model=
+#
+# vm.memballoon.disable=true
+# Disable memory ballooning on vm guests for overcommit, by default overcommit
+# feature enables balloon and sets currentMemory to a minimum value