You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/04 13:06:40 UTC

[1/2] git commit: updated refs/heads/master to 2af9611

Repository: cloudstack
Updated Branches:
  refs/heads/master 5f6104155 -> 2af9611c2


CLOUDSTACK-8924: Made changes based on the comments from @pvr9711


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

Branch: refs/heads/master
Commit: d39c6a0e18f37ffcb60c06a232ff1e0d9f926d03
Parents: f241455
Author: sanjeev <sa...@apache.org>
Authored: Mon Oct 26 14:29:01 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Mon Oct 26 14:29:01 2015 +0530

----------------------------------------------------------------------
 setup/dev/basic.cfg | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d39c6a0e/setup/dev/basic.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg
index 5016b76..db8c59b 100644
--- a/setup/dev/basic.cfg
+++ b/setup/dev/basic.cfg
@@ -168,6 +168,10 @@
         {
             "name": "check.pod.cidrs",
             "value": "true"
+        },
+        {
+            "name": "enable.dynamic.scale.vm",
+            "value": "true"
         }
     ],
     "mgtSvr": [


[2/2] git commit: updated refs/heads/master to 2af9611

Posted by re...@apache.org.
Merge pull request #902 from sanju1010/simulator

CLOUDSTACK-8924: Enable dynamic scaling to run test_scale_vm.py test on simulatorSimulator setup uses the config file from following location:
tools/marvin/marvin/config/setup.cfg
Added global setting parameter "enable.dynamic.scale.vm" to above config file, so that dynamic scale vm tests can be run on simulator.

* pr/902:
  CLOUDSTACK-8924: Made changes based on the comments from @pvr9711

Signed-off-by: Remi Bergsma <gi...@remi.nl>


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

Branch: refs/heads/master
Commit: 2af9611c20530e1e1900acea6e753e9e1ac5acf7
Parents: 5f61041 d39c6a0
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Nov 4 13:05:43 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Nov 4 13:05:43 2015 +0100

----------------------------------------------------------------------
 setup/dev/basic.cfg | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------