You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/20 16:17:41 UTC
[1/2] git commit: Updated payload file name in cartridge agent sh
Updated Branches:
refs/heads/master 8c6a58c97 -> 1aacd8bd4
Updated payload file name in cartridge agent sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/34544d58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34544d58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34544d58
Branch: refs/heads/master
Commit: 34544d58c1eb2133dd079a7b69ee346730624917
Parents: d479825
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 20 20:47:20 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 20 20:47:20 2013 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/bin/cartridge-agent.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34544d58/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh b/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
index b24d1bf..cceba0c 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/cartridge-agent.sh
@@ -31,7 +31,7 @@ properties="-Dmb.ip=MB-IP
-Djndi.properties.template.file.path=${script_path}/../conf/templates/jndi.properties.template
-Djndi.properties.dir=${script_path}/../conf
-Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties
- -Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch.params
+ -Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params
-Dcep.stats.publisher.enabled=true"
# Uncomment below line to enable remote debugging
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1aacd8bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1aacd8bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1aacd8bd
Branch: refs/heads/master
Commit: 1aacd8bd47a8edc72076f9f3a19cc2665500236d
Parents: 34544d5 8c6a58c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 20 20:47:34 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 20 20:47:34 2013 +0530
----------------------------------------------------------------------
.../autoscaler/NetworkPartitionContext.java | 12 ++---
.../stratos/autoscaler/PartitionContext.java | 4 +-
.../cloud/controller/CloudControllerClient.java | 21 ++++-----
.../deployment/policy/DeploymentPolicy.java | 5 +-
.../internal/AutoscalerServerComponent.java | 25 ++++++----
.../health/HealthEventMessageDelegator.java | 42 ++++++++++-------
.../autoscaler/policy/PolicyManager.java | 30 +++++-------
.../autoscaler/registry/RegistryManager.java | 6 +--
.../topology/AutoscalerTopologyReceiver.java | 8 ++--
.../health/stat/AverageLoadAverageEvent.java | 25 ++++------
.../stat/AverageMemoryConsumptionEvent.java | 25 ++++------
.../stat/AverageRequestsInFlightEvent.java | 24 ++++------
.../health/stat/GradientOfLoadAverageEvent.java | 24 ++++------
.../stat/GradientOfMemoryConsumptionEvent.java | 24 ++++------
.../stat/GradientOfRequestsInFlightEvent.java | 24 ++++------
.../stat/MemberAverageLoadAverageEvent.java | 17 +++----
.../MemberAverageMemoryConsumptionEvent.java | 16 +++----
.../event/health/stat/MemberFaultEvent.java | 31 +++++--------
.../stat/MemberGradientOfLoadAverageEvent.java | 17 +++----
.../MemberGradientOfMemoryConsumptionEvent.java | 17 +++----
...emberSecondDerivativeOfLoadAverageEvent.java | 17 +++----
...econdDerivativeOfMemoryConsumptionEvent.java | 17 +++----
.../SecondDerivativeOfLoadAverageEvent.java | 24 ++++------
...econdDerivativeOfMemoryConsumptionEvent.java | 17 +++----
...SecondDerivativeOfRequestsInFlightEvent.java | 24 ++++------
.../stat/AverageLoadAverageEventListener.java | 28 ++++++++++++
.../AverageMemoryConsumptionEventListener.java | 28 ++++++++++++
.../AverageRequestsInFlightEventListener.java | 28 ++++++++++++
.../GradientOfLoadAverageEventListener.java | 28 ++++++++++++
...radientOfMemoryConsumptionEventListener.java | 28 ++++++++++++
...GradientOfRequestsInFlightEventListener.java | 28 ++++++++++++
.../MemberAverageLoadAverageEventListener.java | 29 ++++++++++++
...erAverageMemoryConsumptionEventListener.java | 28 ++++++++++++
.../health/stat/MemberFaultEventListener.java | 28 ++++++++++++
...emberGradientOfLoadAverageEventListener.java | 48 ++++++++++++++++++++
...radientOfMemoryConsumptionEventListener.java | 28 ++++++++++++
...ondDerivativeOfLoadAverageEventListener.java | 28 ++++++++++++
...ivativeOfMemoryConsumptionEventListener.java | 28 ++++++++++++
...ondDerivativeOfLoadAverageEventListener.java | 28 ++++++++++++
...ivativeOfMemoryConsumptionEventListener.java | 28 ++++++++++++
...rivativeOfRequestsInFlightEventListener.java | 28 ++++++++++++
.../tenant/TenantRemovedEventListener.java | 7 ++-
.../topology/ClusterCreatedEventListener.java | 6 +--
.../topology/ClusterRemovedEventListener.java | 6 +--
.../topology/CompleteTopologyEventListener.java | 6 +--
.../topology/InstanceSpawnedEventListener.java | 6 +--
.../topology/MemberActivatedEventListener.java | 6 +--
.../topology/MemberStartedEventListener.java | 6 +--
.../topology/MemberSuspendedEventListener.java | 7 +--
.../topology/MemberTerminatedEventListener.java | 6 +--
.../topology/ServiceCreatedEventListener.java | 6 +--
.../topology/ServiceRemovedEventListener.java | 6 +--
.../modules/scripts/ec2/cartridge-agent.sh | 36 +++++++++++++--
53 files changed, 728 insertions(+), 341 deletions(-)
----------------------------------------------------------------------