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/10/28 19:21:46 UTC

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

Merge pull request #991 from shapeblue/allow-pluggable-kvmresource-master

[master/4.6] CLOUDSTACK-8999: Don't override resource if provided by agent.propertiesIf a custom resource (kvm/libvirt implementation) is defined in agent.properties
don't override with the default, but check and fallback to the default if
resource property not defined

A simple if-else fix, cc @remibergsma @wido @wilderrodrigues @borisroman and others

* pr/991:
  CLOUDSTACK-8999: Don't override resource if provided by agent.properties

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/da9063e7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da9063e7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da9063e7

Branch: refs/heads/master
Commit: da9063e7dfdd592788f5ee23ff1258b4bb7eee0b
Parents: 88dd300 1e8d39b
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Oct 28 19:20:39 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Oct 28 19:20:47 2015 +0100

----------------------------------------------------------------------
 python/lib/cloudutils/serviceConfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------