git commit: updated refs/heads/4.3-forward to 661a19b

[ml...@apache.org]

Updated Branches:
  refs/heads/4.3-forward e624632df -> 661a19bde


CLOUDSTACK-5968 create vm.memballoon.disable agent parameter


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

Branch: refs/heads/4.3-forward
Commit: 661a19bde3bf9726954f5ba88b8830f8c5a17926
Parents: e624632
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 16:03:52 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Tue Jan 28 16:03:52 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/661a19bd/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