You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/26 01:17:24 UTC
[1/2] git commit: fixing the apt get issue
Updated Branches:
refs/heads/master 910d536d2 -> 0eaf045e6
fixing the apt get issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b0480be3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b0480be3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b0480be3
Branch: refs/heads/master
Commit: b0480be3e86147b82274b0eaaeb32db263928755
Parents: 90236a7
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 26 05:40:03 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 26 05:40:03 2013 +0530
----------------------------------------------------------------------
tools/puppet/manifests/classes/php_cartridge.pp | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b0480be3/tools/puppet/manifests/classes/php_cartridge.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/php_cartridge.pp b/tools/puppet/manifests/classes/php_cartridge.pp
index 2f5d85e..f9bfee9 100755
--- a/tools/puppet/manifests/classes/php_cartridge.pp
+++ b/tools/puppet/manifests/classes/php_cartridge.pp
@@ -29,6 +29,8 @@ class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,ce
source => "puppet:///apt/90forceyes";
}
+#fix for the apt get failure: multiple paths to 'path'. on a failure, logs are enabled to get an idea of what is wrong.
+
exec { "update-apt":
path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin/'],
command => "apt-get update > /dev/null 2>&1 ",
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0eaf045e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0eaf045e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0eaf045e
Branch: refs/heads/master
Commit: 0eaf045e62d62c8bbf3844a24102aadff75dbc6a
Parents: b0480be 910d536
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 26 05:40:24 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 26 05:40:24 2013 +0530
----------------------------------------------------------------------
.../autoscaler/NetworkPartitionContext.java | 22 +--
.../autoscaler/algorithm/OneAfterAnother.java | 139 ++++++++++---------
.../autoscaler/algorithm/RoundRobin.java | 5 +-
.../autoscaler/partition/PartitionManager.java | 4 +-
.../rule/AutoscalerRuleEvaluator.java | 2 +
.../apache/stratos/autoscaler/rule/RuleLog.java | 55 ++++++++
.../autoscaler/rule/RuleTasksDelegator.java | 9 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 3 +-
.../distribution/src/main/conf/mincheck.drl | 13 +-
.../distribution/src/main/conf/scaling.drl | 30 ++--
10 files changed, 178 insertions(+), 104 deletions(-)
----------------------------------------------------------------------