You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/12/24 18:25:00 UTC
[1/2] git commit: increasing the expiry time of obsolute member
Updated Branches:
refs/heads/master 58b6d9974 -> 92ba82da2
increasing the expiry time of obsolute member
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2170f30e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2170f30e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2170f30e
Branch: refs/heads/master
Commit: 2170f30e409856dee1ef7e007a7acd47a1a03b4a
Parents: 7b5746a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Dec 24 22:58:49 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 24 22:58:49 2013 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2170f30e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
index 51150e0..4d298a0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
@@ -55,7 +55,7 @@ public class PartitionContext implements Serializable{
private Properties properties;
// 10 mints as the default
- private long expiryTime = 600000;
+ private long expiryTime = 900000;
// pending members
private List<MemberContext> pendingMembers;
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/92ba82da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/92ba82da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/92ba82da
Branch: refs/heads/master
Commit: 92ba82da2e274f114e4c5cecf1178a3955ade9b4
Parents: 2170f30 58b6d99
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Dec 24 22:59:03 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 24 22:59:03 2013 +0530
----------------------------------------------------------------------
.../balancer/LoadBalancerTopologyReceiver.java | 52 ++++++++++-----
.../rest-api-client/deploy-autoscale-policy.sh | 31 +++++++++
tools/rest-api-client/deploy-cartridge.sh | 31 +++++++++
.../rest-api-client/deploy-deployment-policy.sh | 31 +++++++++
.../deploy-load-balancer-cartridge.sh | 31 +++++++++
tools/rest-api-client/deploy-partition.sh | 31 +++++++++
tools/rest-api-client/subscribe.sh | 31 +++++++++
tools/templates/json/autoscale-policy.json | 28 ++++++++
tools/templates/json/cartridge.json | 49 ++++++++++++++
tools/templates/json/deployment-policy.json | 16 +++++
.../templates/json/load-balancer-cartridge.json | 67 ++++++++++++++++++++
tools/templates/json/partition.json | 14 ++++
tools/templates/json/subscribe.json | 12 ++++
13 files changed, 408 insertions(+), 16 deletions(-)
----------------------------------------------------------------------