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/12 14:21:01 UTC
[1/2] git commit: Removed hard coded deployment policy name
Updated Branches:
refs/heads/master 69e36903c -> ebc27c32d
Removed hard coded deployment policy name
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/108c40e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/108c40e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/108c40e7
Branch: refs/heads/master
Commit: 108c40e7b5d1f5efb8e5ae064795dee11da37c82
Parents: 32a905e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 18:50:04 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 18:50:04 2013 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/messaging/domain/topology/Cluster.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/108c40e7/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
index 9113783..288921c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
@@ -42,7 +42,7 @@ public class Cluster implements Serializable {
private List<String> hostNames;
private String tenantRange;
private String autoscalePolicyName;
- private String deploymentPolicyName = "economy-deployment";
+ private String deploymentPolicyName;
private boolean isLbCluster;
// Key: Member.memberId
@XmlJavaTypeAdapter(MapAdapter.class)
[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/ebc27c32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ebc27c32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ebc27c32
Branch: refs/heads/master
Commit: ebc27c32d32b58dc0fbedcfbd2cce04b9b68d5ce
Parents: 108c40e 69e3690
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 18:50:53 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 18:50:53 2013 +0530
----------------------------------------------------------------------
.../src/conf/cartridge-config.properties | 2 +
.../manager/CartridgeSubscriptionManager.java | 2 +-
.../stratos/adc/mgt/payload/CarbonPayload.java | 8 +-
.../apache/stratos/adc/mgt/payload/Payload.java | 7 +-
.../adc/mgt/utils/CartridgeConstants.java | 1 +
.../apache/stratos/cli/CartridgeInfoBean.java | 20 +-
.../apache/stratos/cli/GenericRestClient.java | 6 +-
.../java/org/apache/stratos/cli/RestClient.java | 13 +-
.../stratos/cli/RestCommandLineService.java | 135 +++++++---
.../stratos/cli/commands/AddTenantCommand.java | 20 +-
.../stratos/cli/commands/SubscribeCommand.java | 13 +-
.../apache/stratos/cli/utils/CliConstants.java | 7 +-
.../impl/CloudControllerServiceImpl.java | 99 +++----
.../cloud/controller/pojo/Cartridge.java | 9 -
.../runtime/FasterLookUpDataHolder.java | 4 +
.../controller/topology/TopologyBuilder.java | 52 ++--
.../resources/conf/cartridge-config.properties | 2 +
.../puppet/etc/puppet/files/cartridge-agent.sh | 108 ++++++++
tools/puppet/etc/puppet/files/environment | 22 ++
.../puppet/etc/puppet/files/event-publisher.sh | 28 ++
.../puppet/etc/puppet/files/event-subscriber.sh | 28 ++
.../etc/puppet/files/get-launch-params.rb | 54 ++++
.../puppet/etc/puppet/files/health-publisher.sh | 33 +++
tools/puppet/etc/puppet/files/healthcheck.sh | 31 +++
tools/puppet/etc/puppet/fileserver.conf | 35 +++
tools/puppet/manifests/classes/apt.pp | 43 ++++
tools/puppet/manifests/classes/hosts.pp | 29 +++
tools/puppet/manifests/classes/java.pp | 65 +++++
tools/puppet/manifests/classes/mcollective.pp | 84 ++++++
tools/puppet/manifests/classes/php_cartridge.pp | 141 ++++++++++
tools/puppet/manifests/classes/ssh.pp | 61 +++++
tools/puppet/manifests/classes/system_config.pp | 77 ++++++
tools/puppet/manifests/nodes.pp | 63 +++++
tools/puppet/manifests/site.pp | 23 ++
tools/puppet/modules/apt/files/90forceyes | 23 ++
.../modules/commons/files/bin/puppet_init.sh | 53 ++++
.../modules/commons/files/bin/sign_jars.sh | 39 +++
.../configs/bin/native/wrapper-linux-x86-32 | Bin 0 -> 111027 bytes
.../commons/files/configs/lib/home/favicon.ico | Bin 0 -> 1150 bytes
tools/puppet/modules/commons/files/environment | 23 ++
.../java/files/jars/copy_java_patches_here | 22 ++
.../java/files/jdk-7u7-linux-x64.tar.gz.file | 22 ++
.../php_cartridge/etc/apache2/apache2.conf.erb | 256 +++++++++++++++++++
.../etc/apache2/sites-available/default-ssl.erb | 195 ++++++++++++++
.../etc/apache2/sites-available/default.erb | 64 +++++
45 files changed, 1838 insertions(+), 184 deletions(-)
----------------------------------------------------------------------